From e5b9c70672f5bb608a35204fab0370d2bef4fa34 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Wed, 7 May 2014 01:23:36 +0200 Subject: 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 --- kde-modules/KDECMakeSettings.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kde-modules/KDECMakeSettings.cmake') 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() -- cgit v1.2.1