diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 16:04:35 +0100 |
|---|---|---|
| committer | Kristian Evers <kristianevers@gmail.com> | 2019-02-18 16:04:35 +0100 |
| commit | dc0b36898f984b8e32db2a40882218d9d85c28e8 (patch) | |
| tree | ba2280df6a7e16bae5038fa20b07aade887803bc /cmake | |
| parent | f61aa8a01961cff194fcf49c66e4ca9b4bd68052 (diff) | |
| parent | 97016c7f7b74bd473c446ee128d1774209eddfc0 (diff) | |
| download | PROJ-dc0b36898f984b8e32db2a40882218d9d85c28e8.tar.gz PROJ-dc0b36898f984b8e32db2a40882218d9d85c28e8.zip | |
Merge remote-tracking branch 'osgeo/master' into 6.0
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/ProjInstallPath.cmake | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/cmake/ProjInstallPath.cmake b/cmake/ProjInstallPath.cmake index 72ffbac2..b42f927f 100644 --- a/cmake/ProjInstallPath.cmake +++ b/cmake/ProjInstallPath.cmake @@ -23,14 +23,7 @@ ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) # for data install testing the PROJ_LIB envVar string(TOLOWER "${PROJECT_NAME}" PROJECT_NAME_LOWER) -if(WIN32) - set(DEFAULT_BIN_SUBDIR bin) - set(DEFAULT_LIB_SUBDIR local/lib) - set(DEFAULT_DATA_SUBDIR share) - set(DEFAULT_INCLUDE_SUBDIR local/include) - set(DEFAULT_DOC_SUBDIR share/doc/proj) - set(DEFAULT_CMAKE_SUBDIR local/lib/cmake/${PROJECT_NAME_LOWER}) -elseif(UNIX) +if(UNIX) include(GNUInstallDirs) set(DEFAULT_BIN_SUBDIR ${CMAKE_INSTALL_BINDIR}) set(DEFAULT_LIB_SUBDIR ${CMAKE_INSTALL_LIBDIR}) @@ -39,7 +32,7 @@ elseif(UNIX) set(DEFAULT_DOC_SUBDIR ${CMAKE_INSTALL_DOCDIR}) set(DEFAULT_CMAKE_SUBDIR ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME_LOWER}) else() - # Common locatoins for Unix and Mac OS X + # Common locations for Unix and Mac OS X set(DEFAULT_BIN_SUBDIR bin) set(DEFAULT_LIB_SUBDIR lib) set(DEFAULT_DATA_SUBDIR share/proj) |