diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2013-04-29 20:27:12 +0200 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2013-04-29 20:42:30 +0200 |
| commit | 286923789ebe5c85b1f89b0b8279c498a968cb78 (patch) | |
| tree | 318f2af5ff9fa8177b4446aea4b588d83a15a6af /cmake/CMakeLists.txt | |
| parent | 7ff0cd0640b906821f9b222924e2545b25d28c0f (diff) | |
| download | dbus-286923789ebe5c85b1f89b0b8279c498a968cb78.tar.gz | |
Fixed cmake windows build system bug not installing runtime part of shared libraries into bin dir.
This patch also take care of different install directories on unix like os.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'cmake/CMakeLists.txt')
| -rw-r--r-- | cmake/CMakeLists.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 45d7fb8a..9c1ef2ec 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -70,6 +70,12 @@ set(DBUS_DAEMONDIR ${EXPANDED_BINDIR}) #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() + if (CYGWIN) set (WIN32) endif (CYGWIN) |