diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-05-10 16:45:32 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-05-10 16:45:32 +0000 |
| commit | 746904b607dc466096d6d9e628e0b6ffd10d81e8 (patch) | |
| tree | 4ac137ed91f47e9b038ebc069d8aa3265510e211 | |
| parent | Remove support for saving as JavaFX 1.x script (*.fx) (diff) | |
| parent | * CMakeLists.txt: Modified file (use the CMAKE_INSTALL_LIBDIR variable instea... (diff) | |
| download | inkscape-746904b607dc466096d6d9e628e0b6ffd10d81e8.tar.gz inkscape-746904b607dc466096d6d9e628e0b6ffd10d81e8.zip | |
Merge branch 'use-cmake-install-libdir' of gitlab.com:YuGiOhJCJ/inkscape
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3050cdec1..9e57c69fb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,7 @@ set(CMAKE_BUILD_TYPE_INIT "Release") include(CMakeScripts/HelperFunctions.cmake) include(CMakeScripts/ConfigEnv.cmake) +include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable project(inkscape) @@ -54,9 +55,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR TRUE) if(APPLE) SET(CMAKE_MACOSX_RPATH TRUE) - SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape") + SET(CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR}/inkscape") else() - SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape") + SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/inkscape") endif() # this can be removed if/when cmake 3.1 is made the minimum required version @@ -91,8 +92,8 @@ set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING # Redirect output files # ----------------------------------------------------------------------------- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin CACHE PATH "Output directory for runtime binaries") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for shared libraries") -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib CACHE PATH "Output directory for static libraries") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} CACHE PATH "Output directory for shared libraries") +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} CACHE PATH "Output directory for static libraries") # ----------------------------------------------------------------------------- # Options @@ -275,6 +276,7 @@ message("") # cmake info message("CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}") message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}") +message("CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}") message("PACKAGE_LOCALE_DIR ${PACKAGE_LOCALE_DIR}") message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}") message("CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}") diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6781534f..bfe00f7b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -385,7 +385,7 @@ if(NOT WIN32) inkview RUNTIME DESTINATION bin) if(BUILD_SHARED_LIBS) - install(TARGETS inkscape_base LIBRARY DESTINATION lib/inkscape) + install(TARGETS inkscape_base LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape) endif() else() install(TARGETS |