diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2007-09-11 17:26:13 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2007-09-11 17:26:13 +0000 |
| commit | 7aa8d70c5c2f6e1a718d0029379764ee35990a5c (patch) | |
| tree | 0f4b8b71daa8b9b7a115545bb197972962d0376e | |
| parent | c9d3b8bd84f2d0f71a0117326393dc7e865ad62b (diff) | |
| download | extra-cmake-modules-7aa8d70c5c2f6e1a718d0029379764ee35990a5c.tar.gz extra-cmake-modules-7aa8d70c5c2f6e1a718d0029379764ee35990a5c.tar.bz2 | |
some minor win32 fix
svn path=/trunk/KDE/kdelibs/; revision=711192
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index dec3fd3e..c34a8190 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -316,18 +316,22 @@ else (_kdeBootStrapping) endif (KDEVERSION) if (WIN32) - set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + # we don't want to be forced to set two pathes into the build tree + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + else (WIN32) + set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) + endif (WIN32) + + if (WIN32) # 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 + # 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(KDE4_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) |