b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

kde-4.14 smokegen: prevent cmake from removing rpath on install

Browse source 
Signed-off-by: Domen Kožar <domen@dev.si>
This commit is contained in:
Karn Kallio 2015-03-29 18:04:53 -04:30 committed by Domen Kožar
parent c265aafb55
commit 3661c7a842
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
pkgs/desktops/kde-4.14/kdebindings/smokegen-CMakeLists.txt-nix.patch
View file

@ -1,13 +1,16 @@
--- smokegen-4.10.5.orig/CMakeLists.txt 2013-06-28 17:14:50.000000000 +0000
+++ smokegen-4.10.5/CMakeLists.txt 2013-07-31 19:15:17.000000000 +0000
@@ -36,6 +36,10 @@
set (CMAKE_SKIP_BUILD_RPATH FALSE)
set (CMAKE_SKIP_RPATH FALSE)
diff -Naur smokegen-4.14.3-upstream/CMakeLists.txt smokegen-4.14.3/CMakeLists.txt
--- smokegen-4.14.3-upstream/CMakeLists.txt 2014-09-15 13:23:01.000000000 -0430
+++ smokegen-4.14.3/CMakeLists.txt 2015-03-29 16:41:59.295598992 -0430
@@ -32,9 +32,9 @@
type.cpp
)
-# force RPATH so that the binary is usable from within the build tree
-set (CMAKE_SKIP_BUILD_RPATH FALSE)
-set (CMAKE_SKIP_RPATH FALSE)
+# add the automatically determined parts of the RPATH
+# which point to directories outside the build tree to the install RPATH
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+
+set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in config.h @ONLY )
add_executable(smokegen ${generator_SRC})