Skip to content

Commit 9ffd959

Browse files
MatthijsBurghMatthijsBurgh
committed
Various CMake cleanup
1 parent 6e752ed commit 9ffd959

File tree

3 files changed

+21
-39
lines changed

3 files changed

+21
-39
lines changed

‎orocos_kdl/CMakeLists.txt‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ ELSE ( NOT CMAKE_BUILD_TYPE )
4747
MESSAGE( STATUS "Build type set to '${CMAKE_BUILD_TYPE}' by user." )
4848
ENDIF ( NOT CMAKE_BUILD_TYPE )
4949

50-
IF(MSVC)
51-
SET( KDL_CFLAGS "/W4 /WX" )
52-
ELSE(MSVC)
53-
SET( KDL_CFLAGS "-Wall -Werror=all -Wextra -Werror=extra" )
54-
ENDIF(MSVC)
50+
if(MSVC)
51+
add_compile_options(/W4 /WX)
52+
else(MSVC)
53+
add_compile_options(-Wall -Werror=all -Wextra -Werror=extra)
54+
endif(MSVC)
5555

5656
find_package(Eigen3 QUIET)
5757
if(NOT EIGEN3_FOUND)
@@ -63,8 +63,7 @@ SET(KDL_CFLAGS "${KDL_CFLAGS} -I${EIGEN3_INCLUDE_DIR}")
6363
# Check the platform STL containers capabilities
6464
include(cmake/CheckSTLContainers.cmake)
6565
CHECK_STL_CONTAINERS()
66-
67-
# Set the default option appropriately
66+
# Set the default option accordingly
6867
if(HAVE_STL_CONTAINER_INCOMPLETE_TYPES)
6968
set(KDL_USE_NEW_TREE_INTERFACE_DEFAULT OFF)
7069
else(HAVE_STL_CONTAINER_INCOMPLETE_TYPES)
@@ -120,7 +119,7 @@ include(CMakePackageConfigHelpers)
120119
# Generate CMake package configuration
121120
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl-config.cmake.in
122121
${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake
123-
INSTALL_DESTINATION share/orocos_kdl/cmake
122+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl
124123
)
125124

126125
write_basic_package_version_file(
@@ -133,25 +132,25 @@ install(
133132
FILES
134133
${PROJECT_BINARY_DIR}/orocos_kdl-config.cmake
135134
${PROJECT_BINARY_DIR}/orocos_kdl-config-version.cmake
136-
DESTINATION share/orocos_kdl/cmake
135+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl
137136
)
138137

139-
INSTALL(FILES cmake/FindEigen3.cmake DESTINATION share/orocos_kdl/cmake)
140-
INSTALL(EXPORT OrocosKDLTargets DESTINATION share/orocos_kdl/cmake)
138+
INSTALL(FILES cmake/FindEigen3.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl)
139+
INSTALL(EXPORT OrocosKDLTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/orocos_kdl)
141140

142141
# Generate pkg-config package configuration
143142
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl.pc.in
144143
${PROJECT_BINARY_DIR}/orocos_kdl.pc
145-
INSTALL_DESTINATION lib${LIB_SUFFIX}/pkgconfig
144+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
146145
)
147146
configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/orocos_kdl.pc.in
148147
${PROJECT_BINARY_DIR}/orocos-kdl.pc
149-
INSTALL_DESTINATION lib${LIB_SUFFIX}/pkgconfig
148+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
150149
)
151150

152151
install(
153152
FILES
154153
${PROJECT_BINARY_DIR}/orocos_kdl.pc
155154
${PROJECT_BINARY_DIR}/orocos-kdl.pc
156-
DESTINATION lib${LIB_SUFFIX}/pkgconfig
155+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
157156
)

‎orocos_kdl/src/CMakeLists.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ TARGET_INCLUDE_DIRECTORIES(orocos-kdl PUBLIC
5858
SET_TARGET_PROPERTIES( orocos-kdl PROPERTIES
5959
SOVERSION "${KDL_VERSION_MAJOR}.${KDL_VERSION_MINOR}"
6060
VERSION "${KDL_VERSION}"
61-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS}"
6261
PUBLIC_HEADER "${KDL_HPPS};${CMAKE_CURRENT_BINARY_DIR}/config.h"
6362
)
6463

‎orocos_kdl/tests/CMakeLists.txt‎

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,58 +5,42 @@ IF(ENABLE_TESTS)
55

66
ADD_EXECUTABLE(framestest framestest.cpp test-runner.cpp)
77
TARGET_LINK_LIBRARIES(framestest orocos-kdl ${CPPUNIT})
8-
SET(TESTNAME "framestest")
9-
SET_TARGET_PROPERTIES( framestest PROPERTIES
10-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
8+
target_compile_definitions(framestest PRIVATE TESTNAME="framestest")
119
ADD_TEST(NAME framestest COMMAND framestest)
1210

1311
ADD_EXECUTABLE(kinfamtest kinfamtest.cpp test-runner.cpp)
1412
TARGET_LINK_LIBRARIES(kinfamtest orocos-kdl ${CPPUNIT})
15-
SET(TESTNAME "kinfamtest")
16-
SET_TARGET_PROPERTIES( kinfamtest PROPERTIES
17-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS}")
13+
target_compile_definitions(kinfamtest PRIVATE TESTNAME="kinfamtest")
1814
ADD_TEST(NAME kinfamtest COMMAND kinfamtest)
1915

2016
ADD_EXECUTABLE(solvertest solvertest.cpp test-runner.cpp)
2117
TARGET_LINK_LIBRARIES(solvertest orocos-kdl ${CPPUNIT})
22-
SET(TESTNAME "solvertest")
23-
SET_TARGET_PROPERTIES( solvertest PROPERTIES
24-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
18+
target_compile_definitions(solvertest PRIVATE TESTNAME="solvertest")
2519
ADD_TEST(NAME solvertest COMMAND solvertest)
2620

2721
ADD_EXECUTABLE(inertiatest inertiatest.cpp test-runner.cpp)
2822
TARGET_LINK_LIBRARIES(inertiatest orocos-kdl ${CPPUNIT})
29-
SET(TESTNAME "inertiatest")
30-
SET_TARGET_PROPERTIES( inertiatest PROPERTIES
31-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
23+
target_compile_definitions(inertiatest PRIVATE TESTNAME="inertiatest")
3224
ADD_TEST(NAME inertiatest COMMAND inertiatest)
3325

3426
ADD_EXECUTABLE(jacobiantest jacobiantest.cpp test-runner.cpp)
35-
SET(TESTNAME "jacobiantest")
3627
TARGET_LINK_LIBRARIES(jacobiantest orocos-kdl ${CPPUNIT})
37-
SET_TARGET_PROPERTIES( jacobiantest PROPERTIES
38-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
28+
target_compile_definitions(jacobiantest PRIVATE TESTNAME="jacobiantest")
3929
ADD_TEST(NAME jacobiantest COMMAND jacobiantest)
4030

4131
ADD_EXECUTABLE(jacobiandottest jacobiandottest.cpp test-runner.cpp)
42-
SET(TESTNAME "jacobiandottest")
4332
TARGET_LINK_LIBRARIES(jacobiandottest orocos-kdl ${CPPUNIT})
44-
SET_TARGET_PROPERTIES( jacobiandottest PROPERTIES
45-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
33+
target_compile_definitions(jacobiandottest PRIVATE TESTNAME="jacobiandottest")
4634
ADD_TEST(NAME jacobiandottest COMMAND jacobiandottest)
4735

4836
ADD_EXECUTABLE(velocityprofiletest velocityprofiletest.cpp test-runner.cpp)
49-
SET(TESTNAME "velocityprofiletest")
5037
TARGET_LINK_LIBRARIES(velocityprofiletest orocos-kdl ${CPPUNIT})
51-
SET_TARGET_PROPERTIES( velocityprofiletest PROPERTIES
52-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
38+
target_compile_definitions(velocityprofiletest PRIVATE TESTNAME="velocityprofiletest")
5339
ADD_TEST(NAME velocityprofiletest COMMAND velocityprofiletest)
5440

5541
ADD_EXECUTABLE(treeinvdyntest treeinvdyntest.cpp test-runner.cpp)
56-
SET(TESTNAME "treeinvdyntest")
5742
TARGET_LINK_LIBRARIES(treeinvdyntest orocos-kdl ${CPPUNIT})
58-
SET_TARGET_PROPERTIES( treeinvdyntest PROPERTIES
59-
COMPILE_FLAGS "${CMAKE_CXX_FLAGS_ADD} ${KDL_CFLAGS} -DTESTNAME=\"\\\"${TESTNAME}\\\"\" ")
43+
target_compile_definitions(treeinvdyntest PRIVATE TESTNAME="treeinvdyntest")
6044
ADD_TEST(NAME treeinvdyntest COMMAND treeinvdyntest)
6145

6246
# ADD_EXECUTABLE(rallnumbertest rallnumbertest.cpp)

0 commit comments

Comments
 (0)