[evolution-data-server] Bug 774234 - Unset INSTALL_RPATH for libs not linking libedbus-private
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-data-server] Bug 774234 - Unset INSTALL_RPATH for libs not linking libedbus-private
- Date: Fri, 11 Nov 2016 08:08:15 +0000 (UTC)
commit f7ced6cfa0ee1ad04b98d4208b5b3693f132f020
Author: Dominique Leuenberger <dimstar opensuse org>
Date: Thu Nov 10 23:07:06 2016 +0100
Bug 774234 - Unset INSTALL_RPATH for libs not linking libedbus-private
src/camel/CMakeLists.txt | 6 ++++++
src/private/CMakeLists.txt | 4 ++++
2 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/src/camel/CMakeLists.txt b/src/camel/CMakeLists.txt
index a45e2ca..82e164f 100644
--- a/src/camel/CMakeLists.txt
+++ b/src/camel/CMakeLists.txt
@@ -271,6 +271,7 @@ set_target_properties(camel PROPERTIES
VERSION "${LIBCAMEL_CURRENT}.${LIBCAMEL_REVISION}.${LIBCAMEL_AGE}"
SOVERSION ${LIBCAMEL_CURRENT}
OUTPUT_NAME camel-${API_VERSION}
+ INSTALL_RPATH ""
)
target_compile_definitions(camel PRIVATE
@@ -357,6 +358,7 @@ if(NOT WIN32)
set_target_properties(camel-lock-helper PROPERTIES
OUTPUT_NAME camel-lock-helper-${API_VERSION}
+ INSTALL_RPATH ""
)
target_compile_definitions(camel-lock-helper PRIVATE
@@ -446,6 +448,10 @@ add_executable(camel-gpg-photo-saver
camel-gpg-photo-saver.c
)
+set_target_properties(camel-gpg-photo-saver PROPERTIES
+ INSTALL_RPATH ""
+)
+
target_compile_definitions(camel-gpg-photo-saver PRIVATE
-DG_LOG_DOMAIN=\"camel-gpg-photo-saver\"
)
diff --git a/src/private/CMakeLists.txt b/src/private/CMakeLists.txt
index ba7197c..401acf2 100644
--- a/src/private/CMakeLists.txt
+++ b/src/private/CMakeLists.txt
@@ -164,6 +164,10 @@ add_library(edbus-private SHARED
${GENERATED_DBUS_SUBPROCESS_BACKEND}
)
+set_target_properties(edbus-private PROPERTIES
+ INSTALL_RPATH ""
+)
+
target_compile_definitions(edbus-private PRIVATE
-DG_LOG_DOMAIN=\"libedbus-private\"
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]