diff options
| author | Alex Richardson <arichardson.kde@gmail.com> | 2014-05-07 01:23:36 +0200 |
|---|---|---|
| committer | Alex Richardson <arichardson.kde@gmail.com> | 2014-05-07 01:23:36 +0200 |
| commit | e5b9c70672f5bb608a35204fab0370d2bef4fa34 (patch) | |
| tree | 113c02bdeb9193b6a34f55ea2e9609a9d57f3108 /kde-modules | |
| parent | 73992f139276b75aeddf78f476644a2d82f9e802 (diff) | |
| download | extra-cmake-modules-e5b9c70672f5bb608a35204fab0370d2bef4fa34.tar.gz extra-cmake-modules-e5b9c70672f5bb608a35204fab0370d2bef4fa34.tar.bz2 | |
Windows: Make sure plugin dlls get built inside ${CMAKE_BINARY_DIR}/bin
This is needed for e.g. kpluginfactorytest in kcoreaddons. Plugins are
searched relative to the directory containing the running executable and
before this commit the unit test was in ${CMAKE_BINARY_DIR}/bin and
the plugin dll in ${CMAKE_BINARY_DIR}/lib, which meant that it could not be
found. This was not a problem on Linux since there the unit test and the
plugin .so ends up in ${CMAKE_CURRENT_BINARY_DIR}.
Reviewed on #kde-windows
Diffstat (limited to 'kde-modules')
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index 0fc1a5a3..4ccbf82e 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -173,7 +173,7 @@ if(NOT KDE_SKIP_BUILD_SETTINGS) # even without installation. if(WIN32) set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") - set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") endif() |