From 4efa44d46fb1bc04d590edc635ad6376ccc6d6e6 Mon Sep 17 00:00:00 2001 From: Charles Karney Date: Sat, 25 Jan 2020 10:03:46 -0500 Subject: Remove legacy CMake target name "proj" addressing #802 --- cmake/CMakeLists.txt | 5 +---- cmake/project-config.cmake.in | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) (limited to 'cmake') diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b9cff123..23be1f23 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -38,10 +38,7 @@ install(FILES RENAME "${PROJECT_NAME_LOWER}-config-version.cmake") # Make information about the cmake targets (the library and the tools) # available. -install(EXPORT targets - FILE ${PROJECT_NAME_LOWER}-targets.cmake - DESTINATION "${CMAKECONFIGDIR}") install(EXPORT targets NAMESPACE ${PROJECT_NAME}:: - FILE ${PROJECT_NAME_LOWER}-namespace-targets.cmake + FILE ${PROJECT_NAME_LOWER}-targets.cmake DESTINATION "${CMAKECONFIGDIR}") diff --git a/cmake/project-config.cmake.in b/cmake/project-config.cmake.in index c62ecb47..fcb0698f 100644 --- a/cmake/project-config.cmake.in +++ b/cmake/project-config.cmake.in @@ -23,7 +23,6 @@ set (@PROJECT_NAME@_BINARY_DIRS "${_ROOT}/@BINDIR@") set (@PROJECT_NAME@_LIBRARIES @PROJECT_NAME@::proj) # Read in the exported definition of the library include ("${_DIR}/@PROJECT_NAME_LOWER@-targets.cmake") -include ("${_DIR}/@PROJECT_NAME_LOWER@-namespace-targets.cmake") unset (_ROOT) unset (_DIR) -- cgit v1.2.3