Skip to content

Commit 88886fa

Browse files
committed
Remove utilities headers and cmake target
Signed-off-by: Steve Peters <[email protected]>
1 parent 9358ed0 commit 88886fa

File tree

6 files changed

+0
-388
lines changed

6 files changed

+0
-388
lines changed

CMakeLists.txt

Lines changed: 0 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,6 @@ set(gz_pkgconfig_input "${CMAKE_CURRENT_SOURCE_DIR}/config/gz-cmake.pc.in")
6565
set(gz_pkgconfig_output "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc")
6666
set(gz_pkgconfig_install_dir "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
6767
set(gz_pkgconfig_abs_install_dir "${CMAKE_INSTALL_FULL_LIBDIR}/pkgconfig")
68-
set(gz_utilities_target ${PROJECT_EXPORT_NAME}-utilities)
69-
set(gz_utilities_import_target_name ${PROJECT_EXPORT_NAME}::${gz_utilities_target})
70-
set(gz_utilities_target_output_filename "${gz_utilities_target}-targets.cmake")
71-
set(simple_utilities_import_name ${PROJECT_EXPORT_NAME}::utilities)
7268

7369
#--------------------------------------
7470
# Configure and install the config file
@@ -116,41 +112,6 @@ install(
116112
DESTINATION ${gz_pkgconfig_install_dir}
117113
COMPONENT pkgconfig)
118114

119-
#============================================================================
120-
# Create and install the utilities component
121-
#============================================================================
122-
# Deprecated: Remove the utilities component in gz-cmake4
123-
add_library(${gz_utilities_target} INTERFACE)
124-
target_include_directories(${gz_utilities_target}
125-
INTERFACE
126-
$<INSTALL_INTERFACE:${GZ_INCLUDE_INSTALL_DIR_FULL}>
127-
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
128-
$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/include>)
129-
130-
# Export and install the interface target
131-
install(
132-
TARGETS ${gz_utilities_target}
133-
EXPORT ${gz_utilities_target}
134-
COMPONENT interface)
135-
136-
export(
137-
EXPORT ${gz_utilities_target}
138-
FILE ${gz_utilities_target_output_filename}
139-
NAMESPACE ${PROJECT_EXPORT_NAME}::)
140-
141-
install(
142-
EXPORT ${gz_utilities_target}
143-
DESTINATION ${gz_config_install_dir}
144-
FILE ${gz_utilities_target_output_filename}
145-
NAMESPACE ${PROJECT_EXPORT_NAME}::)
146-
147-
# Install the header directory
148-
# Note: The trailing slash after "include" is necessary
149-
install(
150-
DIRECTORY include/
151-
DESTINATION ${GZ_INCLUDE_INSTALL_DIR_FULL}
152-
COMPONENT headers)
153-
154115
#============================================================================
155116
# Install the files for this package
156117
#============================================================================

config/gz-cmake-config.cmake.in

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,6 @@ set(@PKG_NAME@_CONFIG_INCLUDED TRUE)
2222

2323
@PACKAGE_INIT@
2424

25-
if(NOT TARGET @gz_utilities_import_target_name@)
26-
include("${CMAKE_CURRENT_LIST_DIR}/@gz_utilities_target_output_filename@")
27-
28-
# Create a simplified imported target name for the utilities library
29-
add_library(@simple_utilities_import_name@ INTERFACE IMPORTED)
30-
set_target_properties(@simple_utilities_import_name@ PROPERTIES
31-
INTERFACE_LINK_LIBRARIES @gz_utilities_import_target_name@)
32-
33-
endif()
34-
3525
# We should only perform these operations if either
3626
# 1. gz-cmake has not been included yet, or
3727
# 2. we need a higher version of gz-cmake than the last one that was included

include/gz/utilities/ExtraTestMacros.hh

Lines changed: 0 additions & 47 deletions
This file was deleted.

include/gz/utilities/SuppressWarning.hh

Lines changed: 0 additions & 73 deletions
This file was deleted.

include/gz/utilities/detail/ExtraTestMacros.hh

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)