Skip to content

Commit c51b5c2

Browse files
committed
fix exports name
1 parent 61f1108 commit c51b5c2

File tree

10 files changed

+25
-18
lines changed

10 files changed

+25
-18
lines changed

CMakeLists.txt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,14 @@ set(CMAKE_CXX_STANDARD 17)
9797

9898
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
9999

100+
include(GNUInstallDirs)
101+
set(LD_TARGETS_EXPORT_NAME ${PROJECT_NAME}Targets)
102+
set(LD_CMAKE_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
103+
set(LD_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME}")
104+
set(LD_CMAKE_PROJECT_CONFIG_FILE "${LD_CMAKE_CONFIG_DIR}/${PROJECT_NAME}Config.cmake")
105+
set(LD_CMAKE_VERSION_CONFIG_FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake")
106+
107+
100108
if (LD_BUILD_UNIT_TESTS)
101109
message(STATUS "LaunchDarkly: building unit tests")
102110
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_GLIBCXX_DEBUG")
@@ -189,21 +197,21 @@ endif ()
189197

190198
# Support installation of a cmake package.
191199
include(CMakePackageConfigHelpers)
192-
include(GNUInstallDirs)
193200

194201
write_basic_package_version_file(
195-
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake"
202+
${LD_CMAKE_VERSION_CONFIG_FILE}
196203
COMPATIBILITY SameMajorVersion
197204
)
198205

199206
install(FILES
200-
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/${CMAKE_PROJECT_NAME}Config.cmake"
201-
"${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}ConfigVersion.cmake"
202-
DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${CMAKE_PROJECT_NAME}"
207+
${LD_CMAKE_PROJECT_CONFIG_FILE}
208+
${LD_CMAKE_VERSION_CONFIG_FILE}
209+
DESTINATION ${LD_CONFIG_INSTALL_DIR}
203210
)
204211

212+
205213
install(
206-
EXPORT "${PROJECT_NAME}Targets"
207-
NAMESPACE "${PROJECT_NAME}::"
208-
DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/${CMAKE_PROJECT_NAME}"
214+
EXPORT ${LD_TARGETS_EXPORT_NAME}
215+
NAMESPACE ${PROJECT_NAME}::
216+
DESTINATION ${LD_CONFIG_INSTALL_DIR}
209217
)

cmake/rfc3339_timestamp.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ target_include_directories(timestamp PUBLIC
2727
)
2828
install(
2929
TARGETS timestamp
30-
EXPORT "${PROJECT_NAME}Targets"
30+
EXPORT ${LD_TARGETS_EXPORT_NAME}
3131
)

libs/client-sdk/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ install(DIRECTORY "${LaunchDarklyCPPClient_SOURCE_DIR}/include/launchdarkly"
6969

7070
install(
7171
TARGETS ${LIBNAME} OPTIONAL
72-
EXPORT "${PROJECT_NAME}Targets"
72+
EXPORT ${LD_TARGETS_EXPORT_NAME}
7373
)

libs/common/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,5 +90,5 @@ target_compile_features(${LIBNAME} PUBLIC cxx_std_17)
9090

9191
install(
9292
TARGETS ${LIBNAME}
93-
EXPORT "${PROJECT_NAME}Targets"
93+
EXPORT ${LD_TARGETS_EXPORT_NAME}
9494
)

libs/internal/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,5 @@ target_compile_features(${LIBNAME} PUBLIC cxx_std_17)
7474

7575
install(
7676
TARGETS ${LIBNAME}
77-
EXPORT "${PROJECT_NAME}Targets"
77+
EXPORT ${LD_TARGETS_EXPORT_NAME}
7878
)

libs/server-sdk-redis-source/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@ target_compile_features(${LIBNAME} PUBLIC cxx_std_17)
5151

5252
install(
5353
TARGETS ${LIBNAME} OPTIONAL
54-
EXPORT "${PROJECT_NAME}Targets"
54+
EXPORT ${LD_TARGETS_EXPORT_NAME}
5555
)

libs/server-sdk/src/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,5 @@ target_compile_features(${LIBNAME} PUBLIC cxx_std_17)
102102

103103
install(
104104
TARGETS ${LIBNAME} OPTIONAL
105-
EXPORT "${PROJECT_NAME}Targets"
106-
105+
EXPORT ${LD_TARGETS_EXPORT_NAME}
107106
)

libs/server-sent-events/src/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,5 +33,5 @@ target_compile_features(${LIBNAME} PUBLIC cxx_std_17)
3333

3434
install(
3535
TARGETS ${LIBNAME}
36-
EXPORT "${PROJECT_NAME}Targets"
36+
EXPORT ${LD_TARGETS_EXPORT_NAME}
3737
)

vendor/foxy/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,5 +259,5 @@ endif ()
259259

260260
install(
261261
TARGETS foxy
262-
EXPORT "${PROJECT_NAME}Targets"
262+
EXPORT ${LD_TARGETS_EXPORT_NAME}
263263
)

vendor/foxy/cmake/certify.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ set(BUILD_TESTING ${PREVIOUS_BUILD_TESTING})
2323

2424
install(
2525
TARGETS core
26-
EXPORT "${PROJECT_NAME}Targets"
26+
EXPORT ${LD_TARGETS_EXPORT_NAME}
2727
)

0 commit comments

Comments
 (0)