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

Proposed by YuGiOhJCJ
Status: Needs review
Proposed branch: lp:~yugiohjcj/inkscape/yugiohjcj-inkscape
Merge into: lp:~inkscape.dev/inkscape/trunk
Diff against target: 68 lines (+9/-7)
3 files modified
CMakeLists.txt (+5/-3)
CMakeScripts/HelperMacros.cmake (+2/-2)
src/CMakeLists.txt (+2/-2)
To merge this branch: bzr merge lp:~yugiohjcj/inkscape/yugiohjcj-inkscape
Reviewer Review Type Date Requested Status
Bryce Harrington (community) code Approve
Review via email: mp+318991@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Bryce Harrington (bryce) wrote :

LGTM

review: Approve (code)

Unmerged revisions

15566. By YuGiOhJCJ
15565. By YuGiOhJCJ

* 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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-03-04 20:39:01 +0000
3+++ CMakeLists.txt 2017-03-04 21:50:59 +0000
4@@ -8,6 +8,7 @@
5
6 include(CMakeScripts/HelperFunctions.cmake)
7 include(CMakeScripts/ConfigEnv.cmake)
8+include(GNUInstallDirs) # for the CMAKE_INSTALL_LIBDIR variable
9
10 # -----------------------------------------------------------------------------
11 # CMake Configuration
12@@ -25,9 +26,9 @@
13
14 if(APPLE)
15 SET(CMAKE_MACOSX_RPATH TRUE)
16- SET(CMAKE_INSTALL_RPATH "@loader_path/../lib/inkscape")
17+ SET(CMAKE_INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR}/inkscape")
18 else()
19- SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/inkscape")
20+ SET(CMAKE_INSTALL_RPATH "$ORIGIN/../${CMAKE_INSTALL_LIBDIR}/inkscape")
21 endif()
22
23 cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths
24@@ -70,7 +71,7 @@
25 # Redirect output files
26 # -----------------------------------------------------------------------------
27 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin CACHE INTERNAL "" )
28-set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" )
29+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR} CACHE INTERNAL "" )
30
31 # -----------------------------------------------------------------------------
32 # Options
33@@ -270,6 +271,7 @@
34 # cmake info
35 message("CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
36 message("CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX}")
37+message("CMAKE_INSTALL_LIBDIR: ${CMAKE_INSTALL_LIBDIR}")
38 message("PACKAGE_LOCALE_DIR ${PACKAGE_LOCALE_DIR}")
39 message("CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
40 message("CMAKE_SYSTEM_VERSION: ${CMAKE_SYSTEM_VERSION}")
41
42=== modified file 'CMakeScripts/HelperMacros.cmake'
43--- CMakeScripts/HelperMacros.cmake 2016-05-02 19:36:16 +0000
44+++ CMakeScripts/HelperMacros.cmake 2017-03-04 21:50:59 +0000
45@@ -35,8 +35,8 @@
46 # listed is helpful for IDE's (QtCreator/MSVC)
47 inkscape_source_group("${sources}")
48 install(TARGETS ${name}
49- LIBRARY DESTINATION lib/inkscape
50- ARCHIVE DESTINATION lib/inkscape
51+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
52+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
53 )
54
55 endmacro()
56
57=== modified file 'src/CMakeLists.txt'
58--- src/CMakeLists.txt 2017-02-06 15:34:17 +0000
59+++ src/CMakeLists.txt 2017-03-04 21:50:59 +0000
60@@ -545,6 +545,6 @@
61 inkscape
62 inkview
63 RUNTIME DESTINATION bin
64- LIBRARY DESTINATION lib/inkscape
65- ARCHIVE DESTINATION lib/inkscape)
66+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape
67+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/inkscape)
68 endif()