From 34049110d349c5c6084d1d3df1471b8848dae026 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 10 Feb 2017 18:25:21 +0100 Subject: [PATCH] Use relative install locations on installing targets with cmake on unix too. Using expanded pathes make no sense in install commands because they may be patched by cmake for example by specifing DESTDIR on install. Using relative install locations also reduces the difference between supported platforms. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=99752 --- cmake/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index c41fb3c..ae388bc 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_LIBDIR}" 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) -- 2.6.6