diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-09 18:17:53 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-09 18:17:53 +0000 |
| commit | 07660ecde4e99774ade07cebd9233de8495ce31f (patch) | |
| tree | 48a0ec942c0cc9f5f3f0d3fee4707c5f8c3d0df7 /modules/FindKDE4.cmake | |
| parent | 16c16f6238c4cd2c5c649af5cd64a7f5b87f64e7 (diff) | |
| download | extra-cmake-modules-07660ecde4e99774ade07cebd9233de8495ce31f.tar.gz extra-cmake-modules-07660ecde4e99774ade07cebd9233de8495ce31f.tar.bz2 | |
fixes for msys
Alex
svn path=/trunk/KDE/kdelibs/; revision=507636
Diffstat (limited to 'modules/FindKDE4.cmake')
| -rw-r--r-- | modules/FindKDE4.cmake | 11 |
1 files changed, 8 insertions, 3 deletions
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 ) |