diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-09-11 13:22:30 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-09-11 13:22:30 +0000 |
| commit | 0b2c28854a84b829db93d318759cfe315807c42b (patch) | |
| tree | 11b2ef59b8ceee914559dc07248e4682716e84cc | |
| parent | eb5eb0fa13e74fbfe3c8e95e9b0fb9360d14a7c8 (diff) | |
| download | extra-cmake-modules-0b2c28854a84b829db93d318759cfe315807c42b.tar.gz extra-cmake-modules-0b2c28854a84b829db93d318759cfe315807c42b.tar.bz2 | |
win32 fix: KDE and QT install dir's are determined on runtime not install time, a patch fixing KDELibsDependencies.cmake will follow
svn path=/trunk/KDE/kdelibs/; revision=711114
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 5ccdc881..dec3fd3e 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -315,8 +315,18 @@ else (_kdeBootStrapping) message(FATAL_ERROR "Couldn't parse KDE version string from the kde4-config output:\n${kdeconfig_output}") endif (KDEVERSION) - - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) + if (WIN32) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + # on win32 the install dir is determined on runtime not install time + # KDELIBS_INSTALL_DIR and QT_INSTALL_DIR are used in KDELibsDependencies.cmake to setup + # kde install pathes and library dependencies + get_filename_component(_DIR ${KDE4_KDECONFIG_EXECUTABLE} PATH ) + get_filename_component(KDELIBS_INSTALL_DIR ${_DIR} PATH ) + get_filename_component(_DIR ${QT_QMAKE_EXECUTABLE} PATH ) + get_filename_component(QT_INSTALL_DIR ${_DIR} PATH ) + else (WIN32) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) + endif (WIN32) # this file contains all dependencies of all libraries of kdelibs, Alex include(${kde_cmake_module_dir}/KDELibsDependencies.cmake) |