From 97016c7f7b74bd473c446ee128d1774209eddfc0 Mon Sep 17 00:00:00 2001 From: "Alan D. Snow" Date: Mon, 18 Feb 2019 08:56:55 -0600 Subject: Windows CMAKE Paths to match osx/linux (#1274) Addressing issue #1177. --- cmake/ProjInstallPath.cmake | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'cmake/ProjInstallPath.cmake') 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) -- cgit v1.2.3