diff --git a/modules/default_build_paths.cmake b/modules/default_build_paths.cmake index c488407..0f4e7a2 100644 --- a/modules/default_build_paths.cmake +++ b/modules/default_build_paths.cmake @@ -3,8 +3,8 @@ #.rst: # -# Sets binary and library output directories to ${PROJECT_BINARY_DIR}/bin -# and ${PROJECT_BINARY_DIR}/lib, respectively. +# Sets binary and library output directories to ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR} +# and ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}, respectively. # # Variables modified:: # @@ -12,6 +12,8 @@ # CMAKE_LIBRARY_OUTPUT_DIRECTORY # CMAKE_RUNTIME_OUTPUT_DIRECTORY -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/bin) +include(GNUInstallDirs) + +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})