From 07660ecde4e99774ade07cebd9233de8495ce31f Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Thu, 9 Feb 2006 18:17:53 +0000 Subject: fixes for msys Alex svn path=/trunk/KDE/kdelibs/; revision=507636 --- modules/FindKDE4.cmake | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'modules/FindKDE4.cmake') diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index e4f0a2d6..a6d016ef 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -81,11 +81,16 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin ) + # adjust dcopidl and the library output path depending on the platform IF (WIN32) - SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) + # under windows dcopidl.bat has to be used, except when using MSYS, then the perl script has to be used, Alex + IF ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) + ELSE ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) + ENDIF ("${CMAKE_GENERATOR}" MATCHES "MSYS") + SET(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} ) -# SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) - # todo: copy Dlls only to ${CMAKE_BINARY_DIR}/lib ELSE (WIN32) SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib ) -- cgit v1.2.1