diff options
| author | Moritz Eberl <moritz@semiodesk.com> | 2016-04-27 07:54:17 +0000 |
|---|---|---|
| committer | Moritz Eberl <moritz@semiodesk.com> | 2016-04-27 07:54:17 +0000 |
| commit | f5d66a6633e96b5c847127c75c1691630fe13c95 (patch) | |
| tree | 105e531799704ec7b5aacc42c42ca89ad8d27034 | |
| parent | Fixed path resolution in plugin loader. (diff) | |
| download | inkscape-f5d66a6633e96b5c847127c75c1691630fe13c95.tar.gz inkscape-f5d66a6633e96b5c847127c75c1691630fe13c95.zip | |
Fixed "make install" to set the right rpath. libinkscape_base.so should now be found correctly.
(bzr r14862.1.2)
| -rw-r--r-- | CMakeLists.txt | 7 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 10 |
2 files changed, 13 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a181ca04..58fb98350 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,6 +19,8 @@ project(inkscape) set(INKSCAPE_VERSION 0.91+devel) set(PROJECT_NAME inkscape) set(CMAKE_INCLUDE_CURRENT_DIR TRUE) +SET(CMAKE_INSTALL_RPATH "$ORIGIN/../lib/") + cmake_policy(SET CMP0003 NEW) # don't be prolific with library paths cmake_policy(SET CMP0005 NEW) # proper define quoting @@ -173,10 +175,7 @@ endforeach() # Installation # ----------------------------------------------------------------------------- if(UNIX) - install( - PROGRAMS ${EXECUTABLE_OUTPUT_PATH}/inkscape ${EXECUTABLE_OUTPUT_PATH}/inkview - DESTINATION ${CMAKE_INSTALL_PREFIX}/bin - ) + #The install directive for the binaries and libraries are found in src/CMakeList.txt install( FILES ${CMAKE_BINARY_DIR}/inkscape.desktop diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e44eb757d..594464172 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -558,6 +558,8 @@ if (NOT "${WITH_EXT_GDL}") endif() + + # Link the inkscape_base library against all external dependencies target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) @@ -565,3 +567,11 @@ target_link_libraries(inkscape_base ${INKSCAPE_TARGET_LIBS}) target_link_libraries(inkscape inkscape_base ) target_link_libraries(inkview inkscape_base) +#Define the installation +install( + TARGETS inkscape_base inkscape inkview + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib +) + + |