Skip to content

Commit f948d62

Browse files
rickertmrickertm
committed
Update minimum required CMake version
1 parent 9689cd4 commit f948d62

31 files changed

+156
-252
lines changed

‎CMakeLists.txt

Lines changed: 12 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
cmake_minimum_required(VERSION 2.8.12)
2-
3-
if(POLICY CMP0042)
4-
cmake_policy(SET CMP0042 NEW)
5-
endif()
1+
cmake_minimum_required(VERSION 3.1)
62

73
if(POLICY CMP0072)
84
cmake_policy(SET CMP0072 NEW)
@@ -12,13 +8,11 @@ if(POLICY CMP0075)
128
cmake_policy(SET CMP0075 NEW)
139
endif()
1410

15-
project(rl)
11+
project(rl VERSION 0.7.0)
1612

17-
set(VERSION_MAJOR 0)
18-
set(VERSION_MINOR 7)
19-
set(VERSION_PATCH 0)
20-
set(VERSION_TWEAK 0)
21-
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
13+
if(NOT PROJECT_VERSION_TWEAK)
14+
set(PROJECT_VERSION_TWEAK 0)
15+
endif()
2216

2317
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
2418

@@ -31,23 +25,11 @@ include(Qt4AutomocMocOptionsBoost)
3125

3226
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")
3327
set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
28+
set(CMAKE_CXX_STANDARD 11)
29+
set(CMAKE_CXX_STANDARD_REQUIRED ON)
3430
set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
3531
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
3632

37-
if(NOT CMAKE_VERSION VERSION_LESS 3.1)
38-
set(CMAKE_CXX_STANDARD 11)
39-
set(CMAKE_CXX_STANDARD_REQUIRED ON)
40-
else()
41-
check_cxx_compiler_flag("-std=c++0x" HAS_CXX_COMPILER_FLAG_STDCXX0X)
42-
if(HAS_CXX_COMPILER_FLAG_STDCXX0X)
43-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
44-
endif()
45-
check_cxx_compiler_flag("-std=c++11" HAS_CXX_COMPILER_FLAG_STDCXX11)
46-
if(HAS_CXX_COMPILER_FLAG_STDCXX11)
47-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
48-
endif()
49-
endif()
50-
5133
if(MSVC)
5234
add_definitions(
5335
-D_ENABLE_EXTENDED_ALIGNED_STORAGE
@@ -111,31 +93,31 @@ export(
11193

11294
configure_package_config_file(
11395
rl-config.cmake.in rl-config.cmake
114-
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${VERSION}
96+
INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${PROJECT_VERSION}
11597
)
11698

11799
install(
118100
FILES ${CMAKE_CURRENT_BINARY_DIR}/rl-config.cmake
119-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${VERSION}
101+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${PROJECT_VERSION}
120102
COMPONENT development
121103
)
122104

123105
write_basic_package_version_file(
124106
${CMAKE_CURRENT_BINARY_DIR}/rl-config-version.cmake
125-
VERSION ${VERSION}
107+
VERSION ${PROJECT_VERSION}
126108
COMPATIBILITY ExactVersion
127109
)
128110

129111
install(
130112
FILES ${CMAKE_CURRENT_BINARY_DIR}/rl-config-version.cmake
131-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${VERSION}
113+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${PROJECT_VERSION}
132114
COMPONENT development
133115
)
134116

135117
if(DEFINED TARGETS)
136118
install(
137119
EXPORT rl
138-
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${VERSION}
120+
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/rl-${PROJECT_VERSION}
139121
NAMESPACE rl::
140122
FILE rl-export.cmake
141123
COMPONENT development

‎cmake/CPackConfig.cmake

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,18 @@ if(MSVC)
1212
set(LINKER_VERSION "${LINKER_VERSION_MAJOR}.${CMAKE_MATCH_2}${CMAKE_MATCH_3}.${CMAKE_MATCH_4}")
1313
endif()
1414
if(CMAKE_CL_64)
15-
set(CPACK_PACKAGE_FILE_NAME "rl-${VERSION}-msvc-${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}-x64")
16-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Robotics Library\\\\${VERSION}\\\\MSVC\\\\${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}\\\\x64")
17-
set(CPACK_PACKAGE_NAME "Robotics Library ${VERSION} - MSVC ${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR} (x64)")
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)")
1818
else()
19-
set(CPACK_PACKAGE_FILE_NAME "rl-${VERSION}-msvc-${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}-x86")
20-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "Robotics Library\\\\${VERSION}\\\\MSVC\\\\${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR}\\\\x86")
21-
set(CPACK_PACKAGE_NAME "Robotics Library ${VERSION} - MSVC ${PLATFORM_TOOLSET_MAJOR}.${PLATFORM_TOOLSET_MINOR} (x86)")
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)")
2222
endif()
2323
else()
24-
set(CPACK_PACKAGE_FILE_NAME "rl-${VERSION}-${CMAKE_SYSTEM_NAME}")
25-
set(CPACK_PACKAGE_INSTALL_DIRECTORY "rl-${VERSION}")
26-
set(CPACK_PACKAGE_NAME "Robotics Library ${VERSION}")
24+
set(CPACK_PACKAGE_FILE_NAME "rl-${PROJECT_VERSION}-${CMAKE_SYSTEM_NAME}")
25+
set(CPACK_PACKAGE_INSTALL_DIRECTORY "rl-${PROJECT_VERSION}")
26+
set(CPACK_PACKAGE_NAME "Robotics Library ${PROJECT_VERSION}")
2727
endif()
2828

2929
set(CPACK_COMPONENT_DEMOS_DEPENDS examples)
@@ -43,7 +43,7 @@ set(CPACK_COMPONENT_SYSTEM_DESCRIPTION "Required system files for the Robotics L
4343
set(CPACK_COMPONENT_SYSTEM_DISPLAY_NAME "Required System Files")
4444
set(CPACK_DEB_COMPONENT_INSTALL ON)
4545
set(CPACK_DEBIAN_DEMOS_FILE_NAME "DEB-DEFAULT")
46-
set(CPACK_DEBIAN_DEMOS_PACKAGE_DEPENDS "librl-examples (= ${VERSION})")
46+
set(CPACK_DEBIAN_DEMOS_PACKAGE_DEPENDS "librl-examples (= ${PROJECT_VERSION})")
4747
set(CPACK_DEBIAN_DEMOS_PACKAGE_SHLIBDEPS ON)
4848
set(CPACK_DEBIAN_DEVELOPMENT_FILE_NAME "DEB-DEFAULT")
4949
set(CPACK_DEBIAN_DEVELOPMENT_PACKAGE_NAME "librl-dev")
@@ -62,7 +62,7 @@ set(CPACK_DEBIAN_PACKAGE_SECTION "devel")
6262
set(CPACK_DEBIAN_PACKAGE_SOURCE "librl")
6363
set(CPACK_DEBIAN_RUNTIME_FILE_NAME "DEB-DEFAULT")
6464
set(CPACK_DEBIAN_RUNTIME_PACKAGE_NAME "librl")
65-
set(CPACK_DEBIAN_RUNTIME_PACKAGE_RECOMMENDS "librl-examples (= ${VERSION})")
65+
set(CPACK_DEBIAN_RUNTIME_PACKAGE_RECOMMENDS "librl-examples (= ${PROJECT_VERSION})")
6666
set(CPACK_DEBIAN_RUNTIME_PACKAGE_SECTION "libs")
6767
set(CPACK_DEBIAN_RUNTIME_PACKAGE_SHLIBDEPS ON)
6868
set(CPACK_NSIS_DISPLAY_NAME ${CPACK_PACKAGE_NAME})
@@ -84,15 +84,15 @@ set(CPACK_NSIS_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
8484
set(CPACK_NSIS_URL_INFO_ABOUT "https://www.roboticslibrary.org/")
8585
set(CPACK_PACKAGE_CONTACT "Robotics Library Team <[email protected]>")
8686
set(CPACK_PACKAGE_VENDOR "Robotics Library")
87-
set(CPACK_PACKAGE_VERSION ${VERSION})
88-
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
89-
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
90-
set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
87+
set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
88+
set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
89+
set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
90+
set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
9191
set(CPACK_PROJECT_CONFIG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPackProjectConfig.cmake)
9292
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.md)
9393
set(CPACK_RPM_COMPONENT_INSTALL ON)
9494
set(CPACK_RPM_DEMOS_FILE_NAME "RPM-DEFAULT")
95-
set(CPACK_RPM_demos_PACKAGE_REQUIRES "rl-examples = ${VERSION}")
95+
set(CPACK_RPM_demos_PACKAGE_REQUIRES "rl-examples = ${PROJECT_VERSION}")
9696
set(CPACK_RPM_DEVELOPMENT_FILE_NAME "RPM-DEFAULT")
9797
set(CPACK_RPM_development_PACKAGE_NAME "rl-devel")
9898
set(CPACK_RPM_DOCUMENTATION_FILE_NAME "RPM-DEFAULT")
@@ -119,7 +119,7 @@ set(CPACK_RPM_PACKAGE_SUMMARY "Robotics Library")
119119
set(CPACK_RPM_PACKAGE_URL "https://www.roboticslibrary.org/contact")
120120
set(CPACK_RPM_RUNTIME_FILE_NAME "RPM-DEFAULT")
121121
set(CPACK_RPM_runtime_PACKAGE_NAME "rl")
122-
set(CPACK_RPM_runtime_PACKAGE_SUGGESTS "rl-examples = ${VERSION}")
122+
set(CPACK_RPM_runtime_PACKAGE_SUGGESTS "rl-examples = ${PROJECT_VERSION}")
123123
set(CPACK_WIX_COMPONENT_INSTALL OFF)
124124
set(CPACK_WIX_EXTENSIONS "WiXUtilExtension")
125125
set(
@@ -145,17 +145,17 @@ list(FIND COMPONENTS runtime RUNTIME_COMPONENT_INDEX)
145145
list(FIND COMPONENTS system SYSTEM_COMPONENT_INDEX)
146146

147147
if(DEMOS_COMPONENT_INDEX GREATER -1)
148-
list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_RECOMMENDS "librl-demos (= ${VERSION})")
149-
list(APPEND CPACK_RPM_runtime_PACKAGE_SUGGESTS "rl-demos = ${VERSION}")
148+
list(APPEND CPACK_DEBIAN_RUNTIME_PACKAGE_RECOMMENDS "librl-demos (= ${PROJECT_VERSION})")
149+
list(APPEND CPACK_RPM_runtime_PACKAGE_SUGGESTS "rl-demos = ${PROJECT_VERSION}")
150150
endif()
151151

152152
if(RUNTIME_COMPONENT_INDEX GREATER -1)
153153
list(APPEND CPACK_COMPONENT_DEMOS_DEPENDS runtime)
154154
list(APPEND CPACK_COMPONENT_DEVELOPMENT_DEPENDS runtime)
155-
list(APPEND CPACK_DEBIAN_DEMOS_PACKAGE_DEPENDS "librl (= ${VERSION})")
156-
list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "librl (= ${VERSION})")
157-
list(APPEND CPACK_RPM_demos_PACKAGE_REQUIRES "rl = ${VERSION}")
158-
list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "rl = ${VERSION}")
155+
list(APPEND CPACK_DEBIAN_DEMOS_PACKAGE_DEPENDS "librl (= ${PROJECT_VERSION})")
156+
list(APPEND CPACK_DEBIAN_DEVELOPMENT_PACKAGE_DEPENDS "librl (= ${PROJECT_VERSION})")
157+
list(APPEND CPACK_RPM_demos_PACKAGE_REQUIRES "rl = ${PROJECT_VERSION}")
158+
list(APPEND CPACK_RPM_development_PACKAGE_REQUIRES "rl = ${PROJECT_VERSION}")
159159
endif()
160160

161161
if(SYSTEM_COMPONENT_INDEX GREATER -1)

‎demos/rlCoachKin/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if(QT_FOUND AND SoQt_FOUND)
7878
set_target_properties(
7979
rlCoachKin
8080
PROPERTIES
81-
VERSION ${VERSION}
81+
VERSION ${PROJECT_VERSION}
8282
)
8383

8484
if(MSVC)
@@ -97,7 +97,7 @@ if(QT_FOUND AND SoQt_FOUND)
9797
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
9898
)
9999

100-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
100+
if(MSVC AND BUILD_SHARED_LIBS)
101101
install(FILES $<TARGET_PDB_FILE:rlCoachKin> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
102102
endif()
103103

@@ -113,8 +113,8 @@ if(QT_FOUND AND SoQt_FOUND)
113113
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlCoachKin.lnk\\\" \\\\
114114
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlCoachKin.exe\\\" \\\\
115115
\\\"\\\\
116-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
117-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlkin\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
116+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
117+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlkin\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
118118
\\\" \\\\
119119
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
120120
\\\"Visualization and kinematics demo with Unimation Puma 560\\\""
@@ -126,7 +126,7 @@ if(QT_FOUND AND SoQt_FOUND)
126126
WIX_SHORTCUTS
127127
${WIX_SHORTCUTS}
128128
"<Shortcut
129-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlkin\\unimation-puma560.xml&quot;\"
129+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlkin\\unimation-puma560.xml&quot;\"
130130
Description=\"Visualization and kinematics demo with Unimation Puma 560\"
131131
Id=\"CM_SP_bin.rlCoachKin.exe\"
132132
Name=\"rlCoachKin\"

‎demos/rlCoachMdl/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ if(QT_FOUND AND SoQt_FOUND)
7878
set_target_properties(
7979
rlCoachMdl
8080
PROPERTIES
81-
VERSION ${VERSION}
81+
VERSION ${PROJECT_VERSION}
8282
)
8383

8484
if(MSVC)
@@ -97,7 +97,7 @@ if(QT_FOUND AND SoQt_FOUND)
9797
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
9898
)
9999

100-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
100+
if(MSVC AND BUILD_SHARED_LIBS)
101101
install(FILES $<TARGET_PDB_FILE:rlCoachMdl> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
102102
endif()
103103

@@ -113,8 +113,8 @@ if(QT_FOUND AND SoQt_FOUND)
113113
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlCoachMdl.lnk\\\" \\\\
114114
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlCoachMdl.exe\\\" \\\\
115115
\\\"\\\\
116-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
117-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlmdl\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
116+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
117+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlmdl\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
118118
\\\" \\\\
119119
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
120120
\\\"Visualization and kinematics demo with Unimation Puma 560\\\""
@@ -126,7 +126,7 @@ if(QT_FOUND AND SoQt_FOUND)
126126
WIX_SHORTCUTS
127127
${WIX_SHORTCUTS}
128128
"<Shortcut
129-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlmdl\\unimation-puma560.xml&quot;\"
129+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlmdl\\unimation-puma560.xml&quot;\"
130130
Description=\"Visualization and kinematics demo with Unimation Puma 560\"
131131
Id=\"CM_SP_bin.rlCoachMdl.exe\"
132132
Name=\"rlCoachMdl\"

‎demos/rlCollisionDemo/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ if(QT_FOUND AND SoQt_FOUND)
7676
set_target_properties(
7777
rlCollisionDemo
7878
PROPERTIES
79-
VERSION ${VERSION}
79+
VERSION ${PROJECT_VERSION}
8080
)
8181

8282
if(MSVC)
@@ -95,7 +95,7 @@ if(QT_FOUND AND SoQt_FOUND)
9595
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
9696
)
9797

98-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
98+
if(MSVC AND BUILD_SHARED_LIBS)
9999
install(FILES $<TARGET_PDB_FILE:rlCollisionDemo> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
100100
endif()
101101

@@ -111,7 +111,7 @@ if(QT_FOUND AND SoQt_FOUND)
111111
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlCollisionDemo.lnk\\\" \\\\
112112
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlCollisionDemo.exe\\\" \\\\
113113
\\\"\\\\
114-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlsg\\\\scene.xml\\\$\\\\\\\"\\\\
114+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\scene.xml\\\$\\\\\\\"\\\\
115115
\\\" \\\\
116116
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
117117
\\\"Collision detection and distance computation demo with basic scene\\\""
@@ -123,7 +123,7 @@ if(QT_FOUND AND SoQt_FOUND)
123123
WIX_SHORTCUTS
124124
${WIX_SHORTCUTS}
125125
"<Shortcut
126-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlsg\\scene.xml&quot;\"
126+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\scene.xml&quot;\"
127127
Description=\"Collision detection and distance computation demo with basic scene\"
128128
Id=\"CM_SP_bin.rlCollisionDemo.exe\"
129129
Name=\"rlCollisionDemo\"

‎demos/rlPlanDemo/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ if(QT_FOUND AND SoQt_FOUND AND (Bullet_FOUND OR (CCD_FOUND AND FCL_FOUND) OR ODE
9393
set_target_properties(
9494
rlPlanDemo
9595
PROPERTIES
96-
VERSION ${VERSION}
96+
VERSION ${PROJECT_VERSION}
9797
)
9898

9999
if(MSVC)
@@ -112,7 +112,7 @@ if(QT_FOUND AND SoQt_FOUND AND (Bullet_FOUND OR (CCD_FOUND AND FCL_FOUND) OR ODE
112112
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
113113
)
114114

115-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
115+
if(MSVC AND BUILD_SHARED_LIBS)
116116
install(FILES $<TARGET_PDB_FILE:rlPlanDemo> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
117117
endif()
118118

@@ -128,7 +128,7 @@ if(QT_FOUND AND SoQt_FOUND AND (Bullet_FOUND OR (CCD_FOUND AND FCL_FOUND) OR ODE
128128
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlPlanDemo.lnk\\\" \\\\
129129
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlPlanDemo.exe\\\" \\\\
130130
\\\"\\\\
131-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlplan\\\\unimation-puma560_boxes_rrtConCon.mdl.xml\\\$\\\\\\\"\\\\
131+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlplan\\\\unimation-puma560_boxes_rrtConCon.mdl.xml\\\$\\\\\\\"\\\\
132132
\\\" \\\\
133133
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
134134
\\\"Path planning demo with Unimation Puma 560 and RRT algorithm\\\""
@@ -140,7 +140,7 @@ if(QT_FOUND AND SoQt_FOUND AND (Bullet_FOUND OR (CCD_FOUND AND FCL_FOUND) OR ODE
140140
WIX_SHORTCUTS
141141
${WIX_SHORTCUTS}
142142
"<Shortcut
143-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlplan\\unimation-puma560_boxes_rrtConCon.mdl.xml&quot;\"
143+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlplan\\unimation-puma560_boxes_rrtConCon.mdl.xml&quot;\"
144144
Description=\"Path planning demo with Unimation Puma 560 and RRT algorithm\"
145145
Id=\"CM_SP_bin.rlPlanDemo.exe\"
146146
Name=\"rlPlanDemo\"

‎demos/rlRotationConverterDemo/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ if(QT_FOUND)
5757
set_target_properties(
5858
rlRotationConverterDemo
5959
PROPERTIES
60-
VERSION ${VERSION}
60+
VERSION ${PROJECT_VERSION}
6161
)
6262

6363
if(MSVC)
@@ -76,7 +76,7 @@ if(QT_FOUND)
7676
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
7777
)
7878

79-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
79+
if(MSVC AND BUILD_SHARED_LIBS)
8080
install(FILES $<TARGET_PDB_FILE:rlRotationConverterDemo> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
8181
endif()
8282

‎demos/rlSimulator/CMakeLists.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ if(QT_FOUND AND SoQt_FOUND)
8181
set_target_properties(
8282
rlSimulator
8383
PROPERTIES
84-
VERSION ${VERSION}
84+
VERSION ${PROJECT_VERSION}
8585
)
8686

8787
if(MSVC)
@@ -100,7 +100,7 @@ if(QT_FOUND AND SoQt_FOUND)
100100
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
101101
)
102102

103-
if(MSVC AND BUILD_SHARED_LIBS AND NOT CMAKE_VERSION VERSION_LESS 3.1)
103+
if(MSVC AND BUILD_SHARED_LIBS)
104104
install(FILES $<TARGET_PDB_FILE:rlSimulator> DESTINATION ${CMAKE_INSTALL_BINDIR} CONFIGURATIONS Debug RelWithDebInfo COMPONENT demos)
105105
endif()
106106

@@ -116,8 +116,8 @@ if(QT_FOUND AND SoQt_FOUND)
116116
\\\"$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\rlSimulator.lnk\\\" \\\\
117117
\\\"$INSTDIR\\\\${CMAKE_INSTALL_BINDIR}\\\\rlSimulator.exe\\\" \\\\
118118
\\\"\\\\
119-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
120-
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${VERSION}\\\\examples\\\\rlmdl\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
119+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlsg\\\\unimation-puma560_boxes.xml\\\$\\\\\\\" \\\\
120+
\\\$\\\\\\\"$INSTDIR\\\\${CMAKE_INSTALL_DATADIR}\\\\rl-${PROJECT_VERSION}\\\\examples\\\\rlmdl\\\\unimation-puma560.xml\\\$\\\\\\\"\\\\
121121
\\\" \\\\
122122
\\\"\\\" \\\"\\\" \\\"\\\" \\\"\\\" \\\\
123123
\\\"Simulation demo with Unimation Puma 560\\\""
@@ -129,7 +129,7 @@ if(QT_FOUND AND SoQt_FOUND)
129129
WIX_SHORTCUTS
130130
${WIX_SHORTCUTS}
131131
"<Shortcut
132-
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${VERSION}\\examples\\rlmdl\\unimation-puma560.xml&quot;\"
132+
Arguments=\"&quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlsg\\unimation-puma560_boxes.xml&quot; &quot;[INSTALL_ROOT]${CMAKE_INSTALL_DATADIR}\\rl-${PROJECT_VERSION}\\examples\\rlmdl\\unimation-puma560.xml&quot;\"
133133
Description=\"Simulation demo with Unimation Puma 560\"
134134
Id=\"CM_SP_bin.rlSimulator.exe\"
135135
Name=\"rlSimulator\"

0 commit comments

Comments
 (0)