Skip to content

Commit 30c9918

Browse files
rickertmrickertm
committed
Update CMake files
1 parent 61db2f6 commit 30c9918

File tree

24 files changed

+330
-314
lines changed

24 files changed

+330
-314
lines changed

‎CMakeLists.txt

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,23 @@ if(NOT PROJECT_VERSION_TWEAK)
1414
set(PROJECT_VERSION_TWEAK 0)
1515
endif()
1616

17+
set(Boost_ADDITIONAL_VERSIONS "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57")
18+
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
19+
set(CMAKE_CXX_STANDARD 11)
20+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
21+
set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT system)
22+
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/lib)
1723
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
24+
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin)
1825

1926
include(CheckCXXCompilerFlag)
2027
include(CMakeDependentOption)
2128
include(CMakePackageConfigHelpers)
2229
include(GenerateExportHeader)
2330
include(GNUInstallDirs)
31+
include(InstallRequiredSystemLibraries)
2432
include(Qt4AutomocMocOptionsBoost)
2533

26-
set(Boost_ADDITIONAL_VERSIONS "1.73.0" "1.73" "1.72.0" "1.72" "1.71.0" "1.71" "1.70.0" "1.70" "1.69.0" "1.69" "1.68.0" "1.68" "1.67.0" "1.67" "1.66.0" "1.66" "1.65.1" "1.65.0" "1.65" "1.64.0" "1.64" "1.63.0" "1.63" "1.62.0" "1.62" "1.61.0" "1.61" "1.60.0" "1.60" "1.59.0" "1.59" "1.58.0" "1.58" "1.57.0" "1.57")
27-
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
28-
set(CMAKE_CXX_STANDARD 11)
29-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
30-
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
31-
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
32-
3334
if(MSVC)
3435
add_definitions(
3536
-D_ENABLE_EXTENDED_ALIGNED_STORAGE
@@ -62,6 +63,8 @@ cmake_dependent_option(RL_BUILD_HAL "Build hardware abstraction layer component"
6263
cmake_dependent_option(RL_BUILD_KIN "Build Denavit-Hartenberg kinematics component" ON "RL_BUILD_MATH;RL_BUILD_XML" OFF)
6364
cmake_dependent_option(RL_BUILD_MDL "Build rigid body kinematics and dynamics component" ON "RL_BUILD_MATH;RL_BUILD_XML" OFF)
6465
cmake_dependent_option(RL_BUILD_SG "Build scene graph abstraction component" ON "RL_BUILD_MATH;RL_BUILD_UTIL;RL_BUILD_XML" OFF)
66+
cmake_dependent_option(RL_BUILD_UTIL_RTAI "Build RTAI support" OFF "RL_BUILD_UTIL" OFF)
67+
cmake_dependent_option(RL_BUILD_UTIL_XENOMAI "Build Xenomai support" OFF "RL_BUILD_UTIL" OFF)
6568

6669
cmake_dependent_option(RL_BUILD_PLAN "Build path planning component" ON "RL_BUILD_KIN;RL_BUILD_MATH;RL_BUILD_MDL;RL_BUILD_SG;RL_BUILD_UTIL;RL_BUILD_XML" OFF)
6770

@@ -81,8 +84,10 @@ endif()
8184

8285
add_subdirectory(doc)
8386

84-
foreach(TARGET IN LISTS TARGETS)
85-
list(APPEND RL_LIBRARIES "rl::${TARGET}")
87+
foreach(target IN LISTS TARGETS)
88+
if(NOT target STREQUAL "util_rtai" AND NOT target STREQUAL "util_xenomai")
89+
list(APPEND RL_LIBRARIES "rl::${target}")
90+
endif()
8691
endforeach()
8792

8893
export(
@@ -128,8 +133,5 @@ if(RL_BUILD_EXTRAS)
128133
add_subdirectory(extras)
129134
endif()
130135

131-
set(CMAKE_INSTALL_SYSTEM_RUNTIME_COMPONENT system)
132-
include(InstallRequiredSystemLibraries)
133-
134136
include(CPackConfig)
135137
include(CPack)

‎cmake/CPackConfig.cmake

Lines changed: 19 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,14 @@ if(MSVC)
1111
set(PLATFORM_TOOLSET_MINOR ${CMAKE_MATCH_2})
1212
set(LINKER_VERSION "${LINKER_VERSION_MAJOR}.${CMAKE_MATCH_2}${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")
1313
endif()
14-
if(CMAKE_CL_64)
15-
set(CPACK_PACKAGE_FILE_NAME "rl-${PROJECT_VERSION}-msvc-${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}-x64")
16-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Robotics Library\\\\${PROJECT_VERSION}\\\\MSVC\\\\${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}\\\\x64")
17-
set(CPACK_PACKAGE_NAME "Robotics Library ${PROJECT_VERSION} - MSVC ${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR} (x64)")
14+
if(CMAKE_SIZEOF_VOID_P EQUAL 4)
15+
set(ARCHITECTURE "x86")
1816
else()
19-
set(CPACK_PACKAGE_FILE_NAME "rl-${PROJECT_VERSION}-msvc-${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}-x86")
20-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Robotics Library\\\\${PROJECT_VERSION}\\\\MSVC\\\\${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}\\\\x86")
21-
set(CPACK_PACKAGE_NAME "Robotics Library ${PROJECT_VERSION} - MSVC ${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR} (x86)")
17+
set(ARCHITECTURE "x64")
2218
endif()
19+
set(CPACK_PACKAGE_FILE_NAME "rl-${PROJECT_VERSION}-msvc-${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}-${ARCHITECTURE}")
20+
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Robotics Library\\\\${PROJECT_VERSION}\\\\MSVC\\\\${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}\\\\${ARCHITECTURE}")
21+
set(CPACK_PACKAGE_NAME "Robotics Library ${PROJECT_VERSION} - MSVC ${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR} (${ARCHITECTURE})")
2322
else()
2423
set(CPACK_PACKAGE_FILE_NAME "rl-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}")
2524
set(CPACK_PACKAGE_INSTALL_DIRECTORY "rl-${PROJECT_VERSION}")
@@ -210,25 +209,25 @@ if(ODE_INCLUDE_DIR AND ODE_LIBRARY_RELEASE)
210209
list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "ode-devel")
211210
endif()
212211

213-
foreach(COMPONENT IN LISTS COMPONENTS)
214-
string(TOUPPER ${COMPONENT} COMPONENT_UPPER)
215-
if(DEFINED CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_DEPENDS)
216-
string(REPLACE ";" ", " CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_DEPENDS "${CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_DEPENDS}")
212+
foreach(component IN LISTS COMPONENTS)
213+
string(TOUPPER ${component} COMPONENT)
214+
if(DEFINED CPACK_DEBIAN_${COMPONENT}_PACKAGE_DEPENDS)
215+
string(REPLACE ";" ", " CPACK_DEBIAN_${COMPONENT}_PACKAGE_DEPENDS "${CPACK_DEBIAN_${COMPONENT}_PACKAGE_DEPENDS}")
217216
endif()
218-
if(DEFINED CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_RECOMMENDS)
219-
string(REPLACE ";" ", " CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_${COMPONENT_UPPER}_PACKAGE_RECOMMENDS}")
217+
if(DEFINED CPACK_DEBIAN_${COMPONENT}_PACKAGE_RECOMMENDS)
218+
string(REPLACE ";" ", " CPACK_DEBIAN_${COMPONENT}_PACKAGE_RECOMMENDS "${CPACK_DEBIAN_${COMPONENT}_PACKAGE_RECOMMENDS}")
220219
endif()
221-
if(DEFINED CPACK_RPM_${COMPONENT}_PACKAGE_REQUIRES)
222-
string(REPLACE ";" ", " CPACK_RPM_${COMPONENT}_PACKAGE_REQUIRES "${CPACK_RPM_${COMPONENT}_PACKAGE_REQUIRES}")
220+
if(DEFINED CPACK_RPM_${component}_PACKAGE_REQUIRES)
221+
string(REPLACE ";" ", " CPACK_RPM_${component}_PACKAGE_REQUIRES "${CPACK_RPM_${component}_PACKAGE_REQUIRES}")
223222
endif()
224-
if(DEFINED CPACK_RPM_${COMPONENT}_PACKAGE_SUGGESTS)
225-
string(REPLACE ";" ", " CPACK_RPM_${COMPONENT}_PACKAGE_SUGGESTS "${CPACK_RPM_${COMPONENT}_PACKAGE_SUGGESTS}")
223+
if(DEFINED CPACK_RPM_${component}_PACKAGE_SUGGESTS)
224+
string(REPLACE ";" ", " CPACK_RPM_${component}_PACKAGE_SUGGESTS "${CPACK_RPM_${component}_PACKAGE_SUGGESTS}")
226225
endif()
227226
endforeach()
228227

229-
string(REPLACE ";" "\r\n" CPACK_NSIS_CREATE_ICONS_EXTRA "${CPACK_NSIS_CREATE_ICONS_EXTRA}")
230-
string(REPLACE ";" "\r\n" CPACK_NSIS_DELETE_ICONS_EXTRA "${CPACK_NSIS_DELETE_ICONS_EXTRA}")
231-
string(REPLACE "/>;<Shortcut" "/>\r\n<Shortcut" WIX_SHORTCUTS "${WIX_SHORTCUTS}")
228+
string(REPLACE ";" "\n" CPACK_NSIS_CREATE_ICONS_EXTRA "${CPACK_NSIS_CREATE_ICONS_EXTRA}")
229+
string(REPLACE ";" "\n" CPACK_NSIS_DELETE_ICONS_EXTRA "${CPACK_NSIS_DELETE_ICONS_EXTRA}")
230+
string(REPLACE "/>;<Shortcut" "/>\n<Shortcut" WIX_SHORTCUTS "${WIX_SHORTCUTS}")
232231

233232
configure_file(cmake/WixExtra.wxs.in ${CMAKE_CURRENT_BINARY_DIR}/WixExtra.wxs)
234233
configure_file(cmake/WixPatch.xml.in ${CMAKE_CURRENT_BINARY_DIR}/WixPatch.xml)

‎demos/rlCollisionDemo/CMakeLists.txt

Lines changed: 101 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -18,118 +18,110 @@ endif()
1818
set(CMAKE_AUTOMOC ON)
1919
set(CMAKE_INCLUDE_CURRENT_DIR ON)
2020

21-
find_package(Bullet)
22-
find_package(fcl)
23-
find_package(ODE)
24-
find_package(PQP)
25-
find_package(solid3)
26-
27-
if(QT_FOUND AND SoQt_FOUND)
28-
if(Bullet_FOUND OR fcl_FOUND OR ODE_FOUND OR PQP_FOUND OR solid3_FOUND)
29-
set(
30-
HDRS
31-
BodyDelegate.h
32-
BodyModel.h
33-
MainWindow.h
34-
SoGradientBackground.h
35-
)
36-
37-
set(
38-
SRCS
39-
BodyDelegate.cpp
40-
BodyModel.cpp
41-
MainWindow.cpp
42-
rlCollisionDemo.cpp
43-
SoGradientBackground.cpp
44-
)
45-
46-
add_executable(
47-
rlCollisionDemo
48-
WIN32
49-
${HDRS}
50-
${SRCS}
51-
${rl_BINARY_DIR}/robotics-library.rc
52-
)
53-
54-
target_compile_definitions(
55-
rlCollisionDemo
56-
PUBLIC
57-
${SoQt_DEFINITIONS}
58-
)
59-
60-
target_include_directories(
61-
rlCollisionDemo
62-
PUBLIC
63-
${OPENGL_INCLUDE_DIR}
64-
${SoQt_INCLUDE_DIRS}
65-
)
66-
67-
target_link_libraries(
68-
rlCollisionDemo
69-
sg
70-
${OPENGL_LIBRARIES}
71-
${QT_LIBRARIES}
72-
${SoQt_LIBRARIES}
73-
)
74-
21+
if(QT_FOUND AND SoQt_FOUND AND (RL_BUILD_SG_BULLET OR RL_BUILD_SG_FCL OR RL_BUILD_SG_ODE OR RL_BUILD_SG_PQP OR RL_BUILD_SG_SOLID))
22+
set(
23+
HDRS
24+
BodyDelegate.h
25+
BodyModel.h
26+
MainWindow.h
27+
SoGradientBackground.h
28+
)
29+
30+
set(
31+
SRCS
32+
BodyDelegate.cpp
33+
BodyModel.cpp
34+
MainWindow.cpp
35+
rlCollisionDemo.cpp
36+
SoGradientBackground.cpp
37+
)
38+
39+
add_executable(
40+
rlCollisionDemo
41+
WIN32
42+
${HDRS}
43+
${SRCS}
44+
${rl_BINARY_DIR}/robotics-library.rc
45+
)
46+
47+
target_compile_definitions(
48+
rlCollisionDemo
49+
PUBLIC
50+
${SoQt_DEFINITIONS}
51+
)
52+
53+
target_include_directories(
54+
rlCollisionDemo
55+
PUBLIC
56+
${OPENGL_INCLUDE_DIR}
57+
${SoQt_INCLUDE_DIRS}
58+
)
59+
60+
target_link_libraries(
61+
rlCollisionDemo
62+
sg
63+
${OPENGL_LIBRARIES}
64+
${QT_LIBRARIES}
65+
${SoQt_LIBRARIES}
66+
)
67+
68+
set_target_properties(
69+
rlCollisionDemo
70+
PROPERTIES
71+
VERSION ${PROJECT_VERSION}
72+
)
73+
74+
if(MSVC)
7575
set_target_properties(
7676
rlCollisionDemo
7777
PROPERTIES
78-
VERSION ${PROJECT_VERSION}
79-
)
80-
81-
if(MSVC)
82-
set_target_properties(
83-
rlCollisionDemo
84-
PROPERTIES
85-
DEBUG_POSTFIX d
86-
)
87-
endif()
88-
89-
install(
90-
TARGETS rlCollisionDemo
91-
COMPONENT demos
92-
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
93-
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
94-
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
95-
)
96-
97-
if(MSVC AND BUILD_SHARED_LIBS)
98-
install(FILES $<TARGET_PDB_FILE:rlCollisionDemo> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
99-
endif()
100-
101-
if(UNIX)
102-
configure_file(rlCollisionDemo.desktop.in rlCollisionDemo.desktop @ONLY)
103-
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rlCollisionDemo.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT demos)
104-
endif()
105-
106-
set(
107-
CPACK_NSIS_CREATE_ICONS_EXTRA
108-
${CPACK_NSIS_CREATE_ICONS_EXTRA}
109-
"CreateShortCut \\\\
110-
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlCollisionDemo.lnk\\\" \\\\
111-
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlCollisionDemo.exe\\\" \\\\
112-
\\\"\\\\
113-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\scene.xml\\\$\\\\\\\"\\\\
114-
\\\" \\\\
115-
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
116-
\\\"Collision detection and distance computation demo with basic scene\\\""
117-
PARENT_SCOPE
118-
)
119-
set(CPACK_NSIS_DELETE_ICONS_EXTRA ${CPACK_NSIS_DELETE_ICONS_EXTRA} "Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\rlCollisionDemo.lnk\\\"" PARENT_SCOPE)
120-
121-
set(
122-
WIX_SHORTCUTS
123-
${WIX_SHORTCUTS}
124-
"<Shortcut
125-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\scene.xml&quot;\"
126-
Description=\"Collision detection and distance computation demo with basic scene\"
127-
Id=\"CM_SP_bin.rlCollisionDemo.exe\"
128-
Name=\"rlCollisionDemo\"
129-
Target=\"[#CM_FP_bin.rlCollisionDemo.exe]\"
130-
WorkingDirectory=\"CM_DP_bin\"
131-
/>"
132-
PARENT_SCOPE
78+
DEBUG_POSTFIX d
13379
)
13480
endif()
81+
82+
install(
83+
TARGETS rlCollisionDemo
84+
COMPONENT demos
85+
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
86+
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
87+
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
88+
)
89+
90+
if(MSVC AND BUILD_SHARED_LIBS)
91+
install(FILES $<TARGET_PDB_FILE:rlCollisionDemo> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
92+
endif()
93+
94+
if(UNIX)
95+
configure_file(rlCollisionDemo.desktop.in rlCollisionDemo.desktop @ONLY)
96+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/rlCollisionDemo.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications COMPONENT demos)
97+
endif()
98+
99+
set(
100+
CPACK_NSIS_CREATE_ICONS_EXTRA
101+
${CPACK_NSIS_CREATE_ICONS_EXTRA}
102+
"CreateShortCut \\\\
103+
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlCollisionDemo.lnk\\\" \\\\
104+
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlCollisionDemo.exe\\\" \\\\
105+
\\\"\\\\
106+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\scene.xml\\\$\\\\\\\"\\\\
107+
\\\" \\\\
108+
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
109+
\\\"Collision detection and distance computation demo with basic scene\\\""
110+
PARENT_SCOPE
111+
)
112+
set(CPACK_NSIS_DELETE_ICONS_EXTRA ${CPACK_NSIS_DELETE_ICONS_EXTRA} "Delete \\\"$SMPROGRAMS\\\\$START_MENU\\\\rlCollisionDemo.lnk\\\"" PARENT_SCOPE)
113+
114+
set(
115+
WIX_SHORTCUTS
116+
${WIX_SHORTCUTS}
117+
"<Shortcut
118+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\scene.xml&quot;\"
119+
Description=\"Collision detection and distance computation demo with basic scene\"
120+
Id=\"CM_SP_bin.rlCollisionDemo.exe\"
121+
Name=\"rlCollisionDemo\"
122+
Target=\"[#CM_FP_bin.rlCollisionDemo.exe]\"
123+
WorkingDirectory=\"CM_DP_bin\"
124+
/>"
125+
PARENT_SCOPE
126+
)
135127
endif()

‎demos/rlPlanDemo/CMakeLists.txt

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,7 @@ endif()
1919
set(CMAKE_AUTOMOC ON)
2020
set(CMAKE_INCLUDE_CURRENT_DIR ON)
2121

22-
find_package(Bullet)
23-
find_package(fcl)
24-
find_package(ODE)
25-
find_package(PQP)
26-
find_package(solid3)
27-
28-
if(QT_FOUND AND SoQt_FOUND AND (Bullet_FOUND OR fcl_FOUND OR ODE_FOUND OR PQP_FOUND OR solid3_FOUND))
22+
if(QT_FOUND AND SoQt_FOUND AND (RL_BUILD_SG_BULLET OR RL_BUILD_SG_FCL OR RL_BUILD_SG_ODE OR RL_BUILD_SG_PQP OR RL_BUILD_SG_SOLID))
2923
set(
3024
HDRS
3125
ConfigurationDelegate.h

‎demos/rlPrmDemo/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
find_package(Boost REQUIRED)
22

3-
find_package(Bullet)
4-
find_package(ODE)
5-
find_package(solid3)
6-
7-
if(Bullet_FOUND OR ODE_FOUND OR solid3_FOUND)
3+
if(RL_BUILD_SG_BULLET OR RL_BUILD_SG_ODE OR RL_BUILD_SG_SOLID)
84
add_executable(
95
rlPrmDemo
106
rlPrmDemo.cpp

‎demos/rlRrtDemo/CMakeLists.txt

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
find_package(Boost REQUIRED)
22

3-
find_package(Bullet)
4-
find_package(ODE)
5-
find_package(solid3)
6-
7-
if(Bullet_FOUND OR ODE_FOUND OR solid3_FOUND)
3+
if(RL_BUILD_SG_BULLET OR RL_BUILD_SG_ODE OR RL_BUILD_SG_SOLID)
84
add_executable(
95
rlRrtDemo
106
rlRrtDemo.cpp

‎demos/rlSimulator/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,6 @@ if(QT_FOUND AND SoQt_FOUND)
6161
target_include_directories(
6262
rlSimulator
6363
PUBLIC
64-
${Boost_INCLUDE_DIRS}
65-
${Coin_INCLUDE_DIRS}
6664
${OPENGL_INCLUDE_DIR}
6765
${SoQt_INCLUDE_DIRS}
6866
)
@@ -72,7 +70,6 @@ if(QT_FOUND AND SoQt_FOUND)
7270
math
7371
mdl
7472
sg
75-
${Coin_LIBRARIES}
7673
${OPENGL_LIBRARIES}
7774
${QT_LIBRARIES}
7875
${SoQt_LIBRARIES}

0 commit comments

Comments
 (0)