diff --git a/CMakeLists.txt b/CMakeLists.txt index a91c66b..5a6cacc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -117,6 +117,7 @@ endif() include( gismoUse ) include( gsConfig ) +include(GNUInstallDirs) message( " GGGGGGGGG GGGG GGGGGGGGG GGGGGG GGGGGG GGGGGGGGGG" ) message( " GGGG GGGG GGGG GGGGGG GGGGGG GGGG GGGG" ) @@ -184,9 +185,9 @@ set (GISMO_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/src" "${PROJECT_SOURCE_DIR}/exter CACHE INTERNAL "${PROJECT_NAME} include directories" ) # Offer the user the choice of overriding the installation directories -set(LIB_INSTALL_DIR lib CACHE STRING "Installation directory for libraries") -set(BIN_INSTALL_DIR bin CACHE STRING "Installation directory for executables") -set(INCLUDE_INSTALL_DIR include CACHE STRING "Installation directory for header files") +set(LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "Installation directory for libraries") +set(BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "Installation directory for executables") +set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "Installation directory for header files") ## ################################################################# ## Extensions diff --git a/cmake/gsInstall.cmake b/cmake/gsInstall.cmake index 52c7c73..54537b9 100644 --- a/cmake/gsInstall.cmake +++ b/cmake/gsInstall.cmake @@ -22,7 +22,7 @@ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}") if(WIN32 AND NOT CYGWIN) set(DEF_CMAKE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake) else() - set(DEF_CMAKE_INSTALL_DIR ${LIB_INSTALL_DIR}/gismo) + set(DEF_CMAKE_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/gismo) endif() set(CMAKE_INSTALL_DIR ${DEF_CMAKE_INSTALL_DIR} CACHE STRING "Installation directory for CMake files")