From f097ac9f8a32d83c5606ed9303f40cc5761f9d05 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Fri, 10 Feb 2017 18:43:51 +0100 Subject: [PATCH] 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 --- cmake/CMakeLists.txt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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) -- 2.47.3