From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Fri, 10 Feb 2017 17:43:51 +0000 (+0100)
Subject: cmake: Use relative install locations on Unix too
X-Git-Tag: dbus-1.11.10~32
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f097ac9f8a32d83c5606ed9303f40cc5761f9d05;p=thirdparty%2Fdbus.git

cmake: Use relative install locations on Unix too

Using expanded paths make no sense in install commands because they
may be patched by cmake for example by specifying DESTDIR on install.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99752
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
---

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 84aa60b9b..ae388bc3f 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -96,11 +96,7 @@ set(DBUS_DATADIR             ${EXPANDED_DATADIR})
 #enable building of shared library
 SET(BUILD_SHARED_LIBS ON)
 
-if(WIN32)
-    set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "bin" LIBRARY DESTINATION "lib" ARCHIVE DESTINATION "lib")
-else()
-    set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${EXPANDED_BINDIR}" LIBRARY DESTINATION "${EXPANDED_LIBDIR}" ARCHIVE DESTINATION "${EXPANDED_LIBDIR}")
-endif()
+set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
 
 if (CYGWIN)
    set (WIN32)