Skip to content

Commit 83f5eb7

Browse files
author
Murilo M. Marinho
committed
[CMakeLists.txt] Updated minimum required to 3.10 to comply with warning. Installing the entire folder and the entire folder to reduce trivial typing.
1 parent 3ff0533 commit 83f5eb7

File tree

1 file changed

+10
-97
lines changed

1 file changed

+10
-97
lines changed

CMakeLists.txt

Lines changed: 10 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
CMAKE_MINIMUM_REQUIRED(VERSION 3.4)
1+
# Updated 2025.05 to 3.10 since compatibility with CMake < 3.10 will be removed from a future version of CMake.
2+
CMAKE_MINIMUM_REQUIRED(VERSION 3.10)
23

34
if(WIN32)
45
set(CMAKE_TOOLCHAIN_FILE C:/vcpkg/scripts/buildsystems/vcpkg.cmake)
@@ -37,6 +38,9 @@ endif()
3738
# DEFINE AND INSTALL LIBRARY AND INCLUDE FOLDER
3839
################################################################
3940

41+
# As of 2025.05, Not using GLOB_RECURSE as it's explicitly discouraged.
42+
# https://stackoverflow.com/questions/3201154/automatically-add-all-files-in-a-folder-to-a-target-using-cmake
43+
# https://cmake.org/cmake/help/latest/command/file.html#filesystem
4044
ADD_LIBRARY(dqrobotics SHARED
4145
src/DQ.cpp
4246

@@ -90,105 +94,14 @@ INSTALL(TARGETS dqrobotics
9094
# INSTALL HEADERS IN SUBFOLDERS
9195
################################################################
9296

93-
# utils headers
94-
INSTALL(FILES
95-
include/dqrobotics/utils/DQ_Math.h
96-
include/dqrobotics/utils/DQ_Geometry.h
97-
include/dqrobotics/utils/DQ_LinearAlgebra.h
98-
include/dqrobotics/utils/DQ_Constants.h
99-
DESTINATION "include/dqrobotics/utils")
100-
101-
# robot_modeling headers
102-
INSTALL(FILES
103-
include/dqrobotics/robot_modeling/DQ_CooperativeDualTaskSpace.h
104-
include/dqrobotics/robot_modeling/DQ_Kinematics.h
105-
include/dqrobotics/robot_modeling/DQ_SerialManipulator.h
106-
include/dqrobotics/robot_modeling/DQ_SerialManipulatorDH.h
107-
include/dqrobotics/robot_modeling/DQ_SerialManipulatorMDH.h
108-
include/dqrobotics/robot_modeling/DQ_SerialManipulatorDenso.h
109-
include/dqrobotics/robot_modeling/DQ_MobileBase.h
110-
include/dqrobotics/robot_modeling/DQ_HolonomicBase.h
111-
include/dqrobotics/robot_modeling/DQ_DifferentialDriveRobot.h
112-
include/dqrobotics/robot_modeling/DQ_WholeBody.h
113-
include/dqrobotics/robot_modeling/DQ_SerialWholeBody.h
114-
DESTINATION "include/dqrobotics/robot_modeling")
115-
116-
# robot_control headers
117-
INSTALL(FILES
118-
include/dqrobotics/robot_control/DQ_KinematicController.h
119-
include/dqrobotics/robot_control/DQ_PseudoinverseController.h
120-
include/dqrobotics/robot_control/DQ_NumericalFilteredPseudoInverseController.h
121-
include/dqrobotics/robot_control/DQ_KinematicConstrainedController.h
122-
include/dqrobotics/robot_control/DQ_QuadraticProgrammingController.h
123-
include/dqrobotics/robot_control/DQ_ClassicQPController.h
124-
DESTINATION "include/dqrobotics/robot_control")
125-
126-
# robots headers
127-
INSTALL(FILES
128-
include/dqrobotics/robots/Ax18ManipulatorRobot.h
129-
include/dqrobotics/robots/BarrettWamArmRobot.h
130-
include/dqrobotics/robots/ComauSmartSixRobot.h
131-
include/dqrobotics/robots/KukaLw4Robot.h
132-
include/dqrobotics/robots/KukaYoubotRobot.h
133-
include/dqrobotics/robots/FrankaEmikaPandaRobot.h
134-
DESTINATION "include/dqrobotics/robots")
135-
136-
# solvers headers
137-
INSTALL(FILES
138-
include/dqrobotics/solvers/DQ_QuadraticProgrammingSolver.h
139-
DESTINATION "include/dqrobotics/solvers")
97+
INSTALL(DIRECTORY
98+
include/
99+
DESTINATION "include")
140100

141101
################################################################
142102
# INSTALL SOURCE FILES (So that the debugger can find them)
143103
################################################################
144104

145-
# base folder
146-
INSTALL(FILES
147-
src/DQ.cpp
105+
INSTALL(DIRECTORY
106+
src/
148107
DESTINATION "src/dqrobotics")
149-
150-
# internal folder
151-
INSTALL(FILES
152-
src/internal/_dq_linesegment.cpp
153-
DESTINATION "src/dqrobotics/internal")
154-
155-
# utils folder
156-
INSTALL(FILES
157-
src/utils/DQ_Geometry.cpp
158-
src/utils/DQ_LinearAlgebra.cpp
159-
src/utils/DQ_Math.cpp
160-
DESTINATION "src/dqrobotics/utils")
161-
162-
# robot_control folder
163-
INSTALL(FILES
164-
src/robot_control/DQ_KinematicController.cpp
165-
src/robot_control/DQ_PseudoinverseController.cpp
166-
src/robot_control/DQ_NumericalFilteredPseudoInverseController.cpp
167-
src/robot_control/DQ_KinematicConstrainedController.cpp
168-
src/robot_control/DQ_QuadraticProgrammingController.cpp
169-
src/robot_control/DQ_ClassicQPController.cpp
170-
DESTINATION "src/dqrobotics/robot_control")
171-
172-
# robot_modeling folder
173-
INSTALL(FILES
174-
src/robot_modeling/DQ_SerialManipulator.cpp
175-
src/robot_modeling/DQ_SerialManipulatorDH.cpp
176-
src/robot_modeling/DQ_SerialManipulatorMDH.cpp
177-
src/robot_modeling/DQ_SerialManipulatorDenso.cpp
178-
src/robot_modeling/DQ_CooperativeDualTaskSpace.cpp
179-
src/robot_modeling/DQ_Kinematics.cpp
180-
src/robot_modeling/DQ_MobileBase.cpp
181-
src/robot_modeling/DQ_DifferentialDriveRobot.cpp
182-
src/robot_modeling/DQ_WholeBody.cpp
183-
src/robot_modeling/DQ_SerialWholeBody.cpp
184-
DESTINATION "src/dqrobotics/robot_modeling")
185-
186-
# robots folder
187-
INSTALL(FILES
188-
src/robots/Ax18ManipulatorRobot.cpp
189-
src/robots/BarrettWamArmRobot.cpp
190-
src/robots/ComauSmartSixRobot.cpp
191-
src/robots/KukaLw4Robot.cpp
192-
src/robots/KukaYoubotRobot.cpp
193-
src/robots/FrankaEmikaPandaRobot.cpp
194-
DESTINATION "src/dqrobotics/robots")

0 commit comments

Comments
 (0)