diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2017-02-10 18:43:51 +0100 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2017-02-10 23:01:06 +0100 |
| commit | f097ac9f8a32d83c5606ed9303f40cc5761f9d05 (patch) | |
| tree | 882c020fb018b33c774c41a60744283483ce7160 /cmake | |
| parent | 2417bcd26f3faa974da43c64a412aec52b0de09c (diff) | |
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 84aa60b9..ae388bc3 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) |