diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-11-24 21:49:41 +0000 |
|---|---|---|
| committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-11-24 22:42:59 +0000 |
| commit | 3064f63a6e440d94ddccce8548c82b7f180048de (patch) | |
| tree | 5c98cf406df8f79d28186f7858639e857364dc63 | |
| parent | 14c0e93755d5a32c3d2029d83094564b8823b7b4 (diff) | |
| download | gflags-3064f63a6e440d94ddccce8548c82b7f180048de.tar.gz gflags-3064f63a6e440d94ddccce8548c82b7f180048de.tar.bz2 gflags-3064f63a6e440d94ddccce8548c82b7f180048de.zip | |
enh: Avoid use of install(EXPORTS) FILE option
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/config.cmake.in | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 14cdb90..7cf93a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -482,6 +482,7 @@ endif () # ---------------------------------------------------------------------------- # installation rules +set (EXPORT_NAME ${PACKAGE_NAME}-targets) file (RELATIVE_PATH INSTALL_PREFIX_REL2CONFIG_DIR "${CMAKE_INSTALL_PREFIX}/${CONFIG_INSTALL_DIR}" "${CMAKE_INSTALL_PREFIX}") configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-install.cmake" @ONLY) configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" @ONLY) @@ -489,14 +490,14 @@ configure_file (cmake/version.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-co if (BUILD_SHARED_LIBS AND INSTALL_SHARED_LIBS) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) - install (TARGETS gflags${opts}_shared DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) + install (TARGETS gflags${opts}_shared DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) endif () endforeach () endif () if (BUILD_STATIC_LIBS AND INSTALL_STATIC_LIBS) foreach (opts IN ITEMS "" _nothreads) if (BUILD_gflags${opts}_LIB) - install (TARGETS gflags${opts}_static DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT gflags-lib) + install (TARGETS gflags${opts}_static DESTINATION ${LIBRARY_INSTALL_DIR} EXPORT ${EXPORT_NAME}) endif () endforeach () endif () @@ -512,7 +513,7 @@ if (INSTALL_HEADERS) FILES "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config-version.cmake" DESTINATION ${CONFIG_INSTALL_DIR} ) - install (EXPORT gflags-lib DESTINATION ${CONFIG_INSTALL_DIR} FILE ${PACKAGE_NAME}-targets.cmake) + install (EXPORT ${EXPORT_NAME} DESTINATION ${CONFIG_INSTALL_DIR}) if (UNIX) install (PROGRAMS src/gflags_completions.sh DESTINATION ${RUNTIME_INSTALL_DIR}) endif () @@ -521,7 +522,7 @@ endif () # ---------------------------------------------------------------------------- # support direct use of build tree set (INSTALL_PREFIX_REL2CONFIG_DIR .) -export (TARGETS ${TARGETS} FILE "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-targets.cmake") +export (TARGETS ${TARGETS} FILE "${PROJECT_BINARY_DIR}/${EXPORT_NAME}.cmake") export (PACKAGE gflags) configure_file (cmake/config.cmake.in "${PROJECT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake" @ONLY) diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in index 6b55990..34649d0 100644 --- a/cmake/config.cmake.in +++ b/cmake/config.cmake.in @@ -7,7 +7,7 @@ set (@PACKAGE_PREFIX@_VERSION_MINOR @PACKAGE_VERSION_MINOR@) set (@PACKAGE_PREFIX@_VERSION_PATCH @PACKAGE_VERSION_PATCH@) # import targets -include ("${CMAKE_CURRENT_LIST_DIR}/@PACKAGE_NAME@-targets.cmake") +include ("${CMAKE_CURRENT_LIST_DIR}/@EXPORT_NAME@.cmake") # installation prefix get_filename_component (CMAKE_CURRENT_LIST_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) |