diff options
| author | Patrick Spendrin <ps_ml@gmx.de> | 2014-05-03 00:52:11 +0200 |
|---|---|---|
| committer | Patrick Spendrin <ps_ml@gmx.de> | 2014-05-04 18:56:36 +0200 |
| commit | 09d355975a6b9d3f89da280627a71e46c606d563 (patch) | |
| tree | 09dff833a736993c5b8dd46e0fc4e47d7fb75c0a | |
| parent | ea75468cd820d17317ef2278ebebe3ca1b61d936 (diff) | |
| download | extra-cmake-modules-09d355975a6b9d3f89da280627a71e46c606d563.tar.gz extra-cmake-modules-09d355975a6b9d3f89da280627a71e46c606d563.tar.bz2 | |
use the correct global variables
use CMAKE_[RUNTIME|ARCHIVE|LIBRARY]_OUTPUT_DIRECTORY. dlls and executables are built into the bin subdir and import & static libraries and plugins end up in the lib subdir of the build directory.
REVIEW:117965
| -rw-r--r-- | kde-modules/KDECMakeSettings.cmake | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/kde-modules/KDECMakeSettings.cmake b/kde-modules/KDECMakeSettings.cmake index c206ff82..0fc1a5a3 100644 --- a/kde-modules/KDECMakeSettings.cmake +++ b/kde-modules/KDECMakeSettings.cmake @@ -163,18 +163,19 @@ if(NOT KDE_SKIP_BUILD_SETTINGS) unset(EXECUTABLE_OUTPUT_PATH) unset(LIBRARY_OUTPUT_PATH) - unset(ARCHIVE_OUTPUT_DIRECTORY) - unset(LIBRARY_OUTPUT_DIRECTORY) - unset(RUNTIME_OUTPUT_DIRECTORY) - - # under Windows, generate all executables and libraries into - # one common directory, so the executables find their dlls + unset(CMAKE_ARCHIVE_OUTPUT_DIRECTORY) + unset(CMAKE_LIBRARY_OUTPUT_DIRECTORY) + unset(CMAKE_RUNTIME_OUTPUT_DIRECTORY) + + # under Windows, output all executables and dlls into + # one common directory, and all static|import libraries and plugins + # into another one. This way test executables can find their dlls + # even without installation. if(WIN32) - set(ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - set(LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - set(RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") + set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") + set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") endif() endif() - ################################################################### |