Merge lp:~yugiohjcj/inkscape/yugiohjcj-inkscape into lp:~inkscape.dev/inkscape/trunk

[YuGiOhJCJ]

[Bryce Harrington (bryce)]

LGTM

review: Approve (code)

Unmerged revisions

15566. By YuGiOhJCJ on 2017-03-04

15565. By YuGiOhJCJ on 2017-03-04

* CMakeLists.txt: use the "CMAKE_INSTALL_LIBDIR" variable instead of a hard-coded "lib" string.
* CMakeScripts/HelperMacros.cmake: use the "CMAKE_INSTALL_LIBDIR" variable instead of a hard-coded "lib" string.
* src/CMakeLists.txt: use the "CMAKE_INSTALL_LIBDIR" variable instead of a hard-coded "lib" string.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-04 20:39:01 +0000
+++ CMakeLists.txt	2017-03-04 21:50:59 +0000
@@ -8,6 +8,7 @@
 
 include(CMakeScripts/HelperFunctions.cmake)
 include(CMakeScripts/ConfigEnv.cmake)
+include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
 
 # -----------------------------------------------------------------------------
 # CMake Configuration
@@ -25,9 +26,9 @@
 
 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()
 
 cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths
@@ -70,7 +71,7 @@
 # Redirect output files
 # -----------------------------------------------------------------------------
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" )
-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" )
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} CACHE INTERNAL "" )
 
 # -----------------------------------------------------------------------------
 # Options
@@ -270,6 +271,7 @@
 # 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}")
 
=== modified file 'CMakeScripts/HelperMacros.cmake'
--- CMakeScripts/HelperMacros.cmake	2016-05-02 19:36:16 +0000
+++ CMakeScripts/HelperMacros.cmake	2017-03-04 21:50:59 +0000
@@ -35,8 +35,8 @@
     # listed is helpful for IDE's (QtCreator/MSVC)
     inkscape_source_group("${sources}")
     install(TARGETS ${name} 
-        LIBRARY DESTINATION lib/inkscape
-        ARCHIVE DESTINATION lib/inkscape
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
         )
 
 endmacro()
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-06 15:34:17 +0000
+++ src/CMakeLists.txt	2017-03-04 21:50:59 +0000
@@ -545,6 +545,6 @@
     inkscape
     inkview 
     RUNTIME DESTINATION bin
-    LIBRARY DESTINATION lib/inkscape
-    ARCHIVE DESTINATION lib/inkscape)
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape)
 endif()