Skip to content

Commit 7e0321c

Browse files
committed
Migrate CMake files
Signed-off-by: methylDragon <methylDragon@gmail.com>
1 parent 92946d9 commit 7e0321c

File tree

4 files changed

+14
-11
lines changed

4 files changed

+14
-11
lines changed

CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ find_package(ignition-cmake3 REQUIRED)
1515
# Configure the project
1616
#============================================================================
1717
set(c++standard 17)
18-
ign_configure_project(VERSION_SUFFIX pre1)
18+
ign_configure_project(
19+
REPLACE_IGNITION_INCLUDE_PATH gz/utils
20+
VERSION_SUFFIX pre1)
1921

2022
#============================================================================
2123
# Set project-specific options

cli/include/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
# to support the vendored and not vendored case, we need to manually call
33
# add_subdirectory of the correct directory, and
44
# target_include_directories(@tgt@ INTERFACE "$<BUILD_INTERFACE:@incl_dirs>")
5-
# that for the usual include directories are handled by ign_add_component
5+
# that for the usual include directories are handled by gz_add_component
66
if(IGN_UTILS_VENDOR_CLI11)
7-
add_subdirectory(vendored-cli/ignition/utils)
8-
target_include_directories(${ign_utils_cli_target_name}
7+
add_subdirectory(vendored-cli/gz/utils)
8+
target_include_directories(${gz_utils_cli_target_name}
99
INTERFACE
1010
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/vendored-cli>")
1111
else()
12-
add_subdirectory(external-cli/ignition/utils)
13-
target_include_directories(${ign_utils_cli_target_name}
12+
add_subdirectory(external-cli/gz/utils)
13+
target_include_directories(${gz_utils_cli_target_name}
1414
INTERFACE
1515
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cli/include/external-cli>")
1616
endif()
1717

18-
add_subdirectory(ignition/utils)
18+
add_subdirectory(gz/utils)

cli/src/CMakeLists.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ ign_add_component(
22
cli
33
INTERFACE
44
INDEPENDENT_FROM_PROJECT_LIB
5-
GET_TARGET_NAME ign_utils_cli_target_name)
5+
GET_TARGET_NAME gz_utils_cli_target_name)
66

77
# Make sure that the name is visible also in cli/include/CMakeLists.txt
8-
set(ign_utils_cli_target_name ${ign_utils_cli_target_name} PARENT_SCOPE)
8+
set(gz_utils_cli_target_name ${gz_utils_cli_target_name} PARENT_SCOPE)
99
if(NOT IGN_UTILS_VENDOR_CLI11)
10-
target_link_libraries(${ign_utils_cli_target_name} INTERFACE CLI11::CLI11)
10+
target_link_libraries(${gz_utils_cli_target_name} INTERFACE CLI11::CLI11)
1111
endif()
1212

1313
ign_get_libsources_and_unittests(sources gtest_sources)

include/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
add_subdirectory(ignition)
1+
add_subdirectory(gz)
2+
install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})

0 commit comments

Comments
 (0)