diff options
| author | Charles Karney <charles.karney@sri.com> | 2020-02-04 14:20:28 -0500 |
|---|---|---|
| committer | Charles Karney <charles.karney@sri.com> | 2020-02-04 14:20:28 -0500 |
| commit | c74781ea2710f18a9f1c9728fa5eca5d3601ad5b (patch) | |
| tree | 098b6e3fde86e89d0a2daa69976769f65b576a81 /cmake/ProjInstallPath.cmake | |
| parent | c3e7876325e5d43586a7eee43db1df9468f90d65 (diff) | |
| download | PROJ-c74781ea2710f18a9f1c9728fa5eca5d3601ad5b.tar.gz PROJ-c74781ea2710f18a9f1c9728fa5eca5d3601ad5b.zip | |
Make PROJ the CMake project name
Allow both find_package(PROJ) and find_package(PROJ4). More details
are in cmake/CMakeLists.txt.
Diffstat (limited to 'cmake/ProjInstallPath.cmake')
| -rw-r--r-- | cmake/ProjInstallPath.cmake | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cmake/ProjInstallPath.cmake b/cmake/ProjInstallPath.cmake index e74519b1..4c63d658 100644 --- a/cmake/ProjInstallPath.cmake +++ b/cmake/ProjInstallPath.cmake @@ -30,7 +30,7 @@ if(UNIX) set(DEFAULT_DATA_SUBDIR ${CMAKE_INSTALL_DATAROOTDIR}/proj) set(DEFAULT_INCLUDE_SUBDIR ${CMAKE_INSTALL_INCLUDEDIR}) set(DEFAULT_DOC_SUBDIR ${CMAKE_INSTALL_DOCDIR}) - set(DEFAULT_CMAKE_SUBDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}) + set(DEFAULT_CMAKE_SUBDIR ${CMAKE_INSTALL_LIBDIR}/cmake) else() # Common locations for Unix and Mac OS X set(DEFAULT_BIN_SUBDIR bin) @@ -39,7 +39,7 @@ else() set(DEFAULT_DOC_SUBDIR doc/proj) set(DEFAULT_INCLUDE_SUBDIR include) set(DEFAULT_DOC_SUBDIR share/doc/proj) - set(DEFAULT_CMAKE_SUBDIR lib/cmake/${PROJECT_NAME_LOWER}) + set(DEFAULT_CMAKE_SUBDIR lib/cmake) endif() # Locations are changeable by user to customize layout of PROJ installation @@ -55,7 +55,7 @@ set(PROJ_DATA_SUBDIR ${DEFAULT_DATA_SUBDIR} CACHE STRING set(PROJ_DOC_SUBDIR ${DEFAULT_DOC_SUBDIR} CACHE STRING "Subdirectory where doc will be installed") set(PROJ_CMAKE_SUBDIR ${DEFAULT_CMAKE_SUBDIR} CACHE STRING - "Subdirectory where cmake proj-config file will be installed") + "Parent of subdirectory where cmake proj-config file will be installed") # Mark *DIR variables as advanced and dedicated to use by power-users only. mark_as_advanced( |