diff options
| author | Charles Karney <charles@karney.com> | 2020-01-25 12:57:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-25 12:57:11 -0500 |
| commit | a6c6d1de6bf70dd4142825bbf759d5a30e728021 (patch) | |
| tree | 0839b62008a7b3f34dff906e3f30c627de2aa23a | |
| parent | 1039889c424af9fd89a637e610c4243839d3cb86 (diff) | |
| parent | 4efa44d46fb1bc04d590edc635ad6376ccc6d6e6 (diff) | |
| download | PROJ-a6c6d1de6bf70dd4142825bbf759d5a30e728021.tar.gz PROJ-a6c6d1de6bf70dd4142825bbf759d5a30e728021.zip | |
Merge pull request #1883 from cffk/cmake-namespace-update
Remove legacy CMake target name "proj" addressing #802
| -rw-r--r-- | cmake/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | cmake/project-config.cmake.in | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index b9cff123..23be1f23 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -39,9 +39,6 @@ install(FILES # 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) |