Commit 7e0321c 1 parent 92946d9 commit 7e0321c Copy full SHA for 7e0321c
File tree 4 files changed +14
-11
lines changed
4 files changed +14
-11
lines changed Original file line number Diff line number Diff line change @@ -15,7 +15,9 @@ find_package(ignition-cmake3 REQUIRED)
15
15
# Configure the project
16
16
#============================================================================
17
17
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)
19
21
20
22
#============================================================================
21
23
# Set project-specific options
Original file line number Diff line number Diff line change 2
2
# to support the vendored and not vendored case, we need to manually call
3
3
# add_subdirectory of the correct directory, and
4
4
# 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
6
6
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 }
9
9
INTERFACE
10
10
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /cli/include/vendored-cli>" )
11
11
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 }
14
14
INTERFACE
15
15
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR} /cli/include/external-cli>" )
16
16
endif ()
17
17
18
- add_subdirectory (ignition /utils)
18
+ add_subdirectory (gz /utils)
Original file line number Diff line number Diff line change @@ -2,12 +2,12 @@ ign_add_component(
2
2
cli
3
3
INTERFACE
4
4
INDEPENDENT_FROM_PROJECT_LIB
5
- GET_TARGET_NAME ign_utils_cli_target_name )
5
+ GET_TARGET_NAME gz_utils_cli_target_name )
6
6
7
7
# 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)
9
9
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)
11
11
endif ()
12
12
13
13
ign_get_libsources_and_unittests(sources gtest_sources)
Original file line number Diff line number Diff line change 1
- add_subdirectory (ignition)
1
+ add_subdirectory (gz)
2
+ install (DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL} )
You can’t perform that action at this time.
0 commit comments