Skip to content

Commit 948b06c

Browse files
authored
Merge pull request #333 from nim65s/cmake
sync submodule
2 parents b0bfbed + feb212b commit 948b06c

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

CMakeLists.txt

Lines changed: 12 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,6 @@ else()
4242
PROPERTY INTERFACE_INCLUDE_DIRECTORIES
4343
)
4444
message(STATUS "JRL cmakemodules found on system at ${JRL_CMAKE_MODULES}")
45-
elseif(${CMAKE_VERSION} VERSION_LESS "3.14.0")
46-
message(
47-
FATAL_ERROR
48-
"\nCan't find jrl-cmakemodules. Please either:\n"
49-
" - use git submodule: 'git submodule update --init'\n"
50-
" - or install https://github.com/jrl-umi3218/jrl-cmakemodules\n"
51-
" - or upgrade your CMake version to >= 3.14 to allow automatic fetching\n"
52-
)
5345
else()
5446
message(STATUS "JRL cmakemodules not found. Let's fetch it.")
5547
FetchContent_Declare(
@@ -64,13 +56,14 @@ endif()
6456
set(AWESOME_CSS_DIR ${PROJECT_SOURCE_DIR}/doc/doxygen-awesome-css)
6557
set(DOXYGEN_HTML_HEADER "${PROJECT_SOURCE_DIR}/doc/header.html")
6658

67-
# Use BoostConfig module distributed by boost library instead of using FindBoost module distributed
68-
# by CMake
59+
# Use BoostConfig module distributed by boost library instead of using FindBoost
60+
# module distributed by CMake
6961
if(POLICY CMP0167)
7062
cmake_policy(SET CMP0167 NEW)
71-
# find_package(SDFormat14) reset this policy (with cmake_minimum_required) and redefine the find_dependency macro.
72-
# Then, futur call of this macro don't use the right version of this policy.
73-
# To avoid that, we define the CMP0167 default value.
63+
# find_package(SDFormat14) reset this policy (with cmake_minimum_required) and
64+
# redefine the find_dependency macro. Then, futur call of this macro don't use
65+
# the right version of this policy. To avoid that, we define the CMP0167
66+
# default value.
7467
set(CMAKE_POLICY_DEFAULT_CMP0167 NEW)
7568
endif()
7669
include(${JRL_CMAKE_MODULES}/base.cmake)
@@ -179,8 +172,8 @@ option(
179172
OFF
180173
)
181174

182-
# Variable containing all the cflags definition relative to optional dependencies
183-
# and options
175+
# Variable containing all the cflags definition relative to optional
176+
# dependencies and options
184177
set(CFLAGS_DEPENDENCIES)
185178

186179
if(INITIALIZE_WITH_NAN)
@@ -307,9 +300,8 @@ list(
307300
option(DOWNLOAD_TRACY "Use FetchContent to install Tracy." OFF)
308301
if(ALIGATOR_TRACY_ENABLE AND DOWNLOAD_TRACY)
309302
# We use FetchContent_Populate because we need EXCLUDE_FROM_ALL to avoid
310-
# installing Tracy with aligator.
311-
# We can directly use EXCLUDE_FROM_ALL in FetchContent_Declare when CMake minimum version
312-
# will be 3.28.
303+
# installing Tracy with aligator. We can directly use EXCLUDE_FROM_ALL in
304+
# FetchContent_Declare when CMake minimum version will be 3.28.
313305
if(POLICY CMP0169)
314306
cmake_policy(SET CMP0169 OLD)
315307
endif()
@@ -390,8 +382,8 @@ function(create_library)
390382
target_link_libraries(${PROJECT_NAME} PUBLIC OpenMP::OpenMP_CXX)
391383
endif()
392384
target_link_libraries(${PROJECT_NAME} PUBLIC fmt::fmt)
393-
# set the install-tree include dirs
394-
# used by dependent projects to consume this target
385+
# set the install-tree include dirs used by dependent projects to consume this
386+
# target
395387
target_include_directories(
396388
${PROJECT_NAME}
397389
PUBLIC
@@ -589,7 +581,4 @@ PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
589581
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_REQUIRED_COMPONENTS})
590582
PKG_CONFIG_APPEND_CFLAGS("${CFLAGS_DEPENDENCIES}")
591583

592-
# Install catkin package.xml
593-
install(FILES package.xml DESTINATION share/${PROJECT_NAME})
594-
595584
SETUP_PROJECT_FINALIZE()

0 commit comments

Comments
 (0)