From 623d9bee46dbb53c4adf1ba8fcbd1c729a9098a6 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 6 Feb 2006 16:56:28 +0000 Subject: -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 --- modules/FindKDE4.cmake | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'modules') 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 ) -- cgit v1.2.1