diff options
| author | Howard Butler <howard@hobu.co> | 2017-09-27 16:25:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-27 16:25:39 -0500 |
| commit | a90a9ec5daa335b8b5eb6c93e4f5a0e48ca5656e (patch) | |
| tree | f0ba9ec27b9cb48ae02b08e5f0648c13bb5cdd1e /cmake | |
| parent | 1402ac196457fb99bb16962c0d1371b6885b44c3 (diff) | |
| download | PROJ-a90a9ec5daa335b8b5eb6c93e4f5a0e48ca5656e.tar.gz PROJ-a90a9ec5daa335b8b5eb6c93e4f5a0e48ca5656e.zip | |
CMake updates (#578)
* install proj4 data in share/proj, not share/
* no need for CMP0022 policy anymore
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Proj4InstallPath.cmake | 8 | ||||
| -rw-r--r-- | cmake/policies.cmake | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/cmake/Proj4InstallPath.cmake b/cmake/Proj4InstallPath.cmake index 04f24670..b06777f4 100644 --- a/cmake/Proj4InstallPath.cmake +++ b/cmake/Proj4InstallPath.cmake @@ -19,7 +19,7 @@ IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) prefix" FORCE) ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) -#TODO +#TODO # for data install testing the PROJ_LIB envVar string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) @@ -34,7 +34,7 @@ elseif(UNIX) include(GNUInstallDirs) set(DEFAULT_BIN_SUBDIR ${CMAKE_INSTALL_BINDIR}) set(DEFAULT_LIB_SUBDIR ${CMAKE_INSTALL_LIBDIR}) - set(DEFAULT_DATA_SUBDIR ${CMAKE_INSTALL_DATADIR}) + 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}) @@ -67,8 +67,8 @@ set(PROJ_CMAKE_SUBDIR ${DEFAULT_CMAKE_SUBDIR} CACHE STRING # Mark *DIR variables as advanced and dedicated to use by power-users only. mark_as_advanced(PROJ_ROOT_DIR PROJ_BIN_SUBDIR - PROJ_LIB_SUBDIR - PROJ_INCLUDE_SUBDIR + PROJ_LIB_SUBDIR + PROJ_INCLUDE_SUBDIR PROJ_DATA_SUBDIR PROJ_DOC_SUBDIR PROJ_CMAKE_SUBDIR ) diff --git a/cmake/policies.cmake b/cmake/policies.cmake index c16fbc12..e1bfd53b 100644 --- a/cmake/policies.cmake +++ b/cmake/policies.cmake @@ -1,5 +1,4 @@ if (CMAKE_MAJOR_VERSION GREATER 2) - cmake_policy(SET CMP0022 OLD) # interface link libraries cmake_policy(SET CMP0042 NEW) # osx rpath cmake_policy(SET CMP0011 NEW) # policy setting endif() |