Skip to content

Commit 32591ea

Browse files
committed
Simplify the CMakeLists
1 parent 4f840bd commit 32591ea

File tree

2 files changed

+2
-17
lines changed

2 files changed

+2
-17
lines changed

CMakeLists.txt

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,24 +129,11 @@ install(TARGETS trantor
129129
install(FILES ${public_net_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/net)
130130
install(FILES ${public_utils_headers} DESTINATION ${INSTALL_INCLUDE_DIR}/trantor/utils)
131131

132-
133-
# Add all targets to the build-tree export set
134-
export(TARGETS trantor
135-
FILE "${PROJECT_BINARY_DIR}/TrantorTargets.cmake")
136-
137132
include(CMakePackageConfigHelpers)
138-
# ... for the build tree(locally included)
139-
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}")
140-
configure_package_config_file(cmake/templates/TrantorConfig.cmake.in
141-
${CMAKE_CURRENT_BINARY_DIR}/TrantorConfig.cmake
142-
INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
143-
PATH_VARS CONF_INCLUDE_DIRS)
144133
# ... for the install tree
145-
set(CONF_INCLUDE_DIRS "${INSTALL_INCLUDE_DIR}")
146134
configure_package_config_file(cmake/templates/TrantorConfig.cmake.in
147135
${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/TrantorConfig.cmake
148-
INSTALL_DESTINATION ${INSTALL_TRANTOR_CMAKE_DIR}
149-
PATH_VARS CONF_INCLUDE_DIRS)
136+
INSTALL_DESTINATION ${INSTALL_TRANTOR_CMAKE_DIR})
150137

151138
# version
152139
write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/TrantorConfigVersion.cmake

cmake/templates/TrantorConfig.cmake.in

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
# Compute paths
1212
add_library(Trantor::Trantor INTERFACE IMPORTED GLOBAL)
13-
set_target_properties(Trantor::Trantor PROPERTIES
14-
INTERFACE_INCLUDE_DIRECTORIES "@PACKAGE_CONF_INCLUDE_DIRS@")
1513

1614
# Our library dependencies (contains definitions for IMPORTED targets)
1715
get_filename_component(TRANTOR_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
@@ -24,5 +22,5 @@ target_link_libraries(Trantor::Trantor INTERFACE trantor)
2422

2523

2624
set(TRANTOR_FOUND TRUE)
27-
set_and_check(TRANTOR_INCLUDE_DIRS "@PACKAGE_CONF_INCLUDE_DIRS@")
25+
get_target_property(TRANTOR_INCLUDE_DIRS trantor INTERFACE_INCLUDE_DIRECTORIES)
2826
set(TRANTOR_LIBRARIES trantor)

0 commit comments

Comments
 (0)