aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2006-02-06 16:56:28 +0000
committerAlexander Neundorf <neundorf@kde.org>2006-02-06 16:56:28 +0000
commit623d9bee46dbb53c4adf1ba8fcbd1c729a9098a6 (patch)
tree37ed706f12da44ae5451bcb695f4efc08b080c97
parent1583b1066841e0f2936b3dcdc91656c451b27b8c (diff)
downloadextra-cmake-modules-623d9bee46dbb53c4adf1ba8fcbd1c729a9098a6.tar.gz
extra-cmake-modules-623d9bee46dbb53c4adf1ba8fcbd1c729a9098a6.tar.bz2
-if (WIN32): create the libraries in the same directory as the executables, so the linker will find them automatically
Alex svn path=/trunk/KDE/kdelibs/; revision=506382
-rw-r--r--modules/FindKDE4.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index 31db32de..dc5d38df 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -75,15 +75,17 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h)
MESSAGE(STATUS "Building kdelibs...")
- SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
- SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
-
SET(KDE4_INCLUDE_DIR ${CMAKE_SOURCE_DIR})
SET(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH})
+
+ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin )
+
IF (WIN32)
- SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat )
+ SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat )
+ SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) # create the libraries in the same directory as the executables, so the linker will find them
ELSE (WIN32)
- SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl )
+ SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl )
+ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
ENDIF (WIN32)
SET(KDE4_KALYPTUS_DIR ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/ )
SET(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/dcopidl2cpp )