summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authornot_anonymous2016-10-12 08:36:33 -0600
committernot_anonymous2016-10-12 08:36:33 -0600
commit5a3600d8f13c4fdd576074518df0a218b2a5299d (patch)
tree7ec8868a98c6c0a1d167aab39f8189a16b81e75f
parent57840736238d93353ebe737f0b63cef0b506cf26 (diff)
downloadaur-5a3600d8f13c4fdd576074518df0a218b2a5299d.tar.gz
updated
-rw-r--r--diff.CMakeLists.txt.apps13
-rw-r--r--diff.CMakeLists.txt.src4
2 files changed, 5 insertions, 12 deletions
diff --git a/diff.CMakeLists.txt.apps b/diff.CMakeLists.txt.apps
index 8cb9050bf1bc..85a6bffded3e 100644
--- a/diff.CMakeLists.txt.apps
+++ b/diff.CMakeLists.txt.apps
@@ -1,16 +1,9 @@
-diff -ur apps/CMakeLists.txt tqsl-2.1.3/apps/CMakeLists.txt
---- apps/CMakeLists.txt 2015-10-21 19:26:38.000000000 +0200
-+++ apps/CMakeLists.txt 2015-11-06 09:30:45.551999076 +0100
-@@ -121,9 +121,9 @@
-
- if(NOT WIN32) #rpath setup
- SET(CMAKE_SKIP_BUILD_RPATH FALSE)
+--- apps/CMakeLists.txt 2014-07-16 19:22:16.000000000 -0600
++++ apps/CMakeLists.txt 2014-12-12 20:00:36.326544639 -0700
+@@ -124,3 +124,3 @@
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
+ SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+ SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/trustedqsl")
- endif()
-
-
diff --git a/diff.CMakeLists.txt.src b/diff.CMakeLists.txt.src
index 182b0a3636e9..18ed4f06d9c2 100644
--- a/diff.CMakeLists.txt.src
+++ b/diff.CMakeLists.txt.src
@@ -1,5 +1,5 @@
---- src/CMakeLists.txt 2014-07-16 19:22:16.000000000 -0600
-+++ src/CMakeLists.txt 2014-12-12 20:01:49.669873492 -0700
+--- src/CMakeLists.txt 2014-07-16 19:22:16.000000000 -0600
++++ src/CMakeLists.txt 2014-12-12 20:01:49.669873492 -0700
@@ -57 +57 @@
-install(TARGETS tqsllib DESTINATION lib)
+install(TARGETS tqsllib DESTINATION lib/trustedqsl)