diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 14:22:36 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-04 14:22:36 +0000 |
| commit | afe0713330569133407e3f1a9d9688dd36dfe09d (patch) | |
| tree | 1494acf469d563f166a8850a4a1ac452e578a18c | |
| parent | fb0d05a8363b1f37c24f995b9565cb90c8625256 (diff) | |
| download | extra-cmake-modules-afe0713330569133407e3f1a9d9688dd36dfe09d.tar.gz extra-cmake-modules-afe0713330569133407e3f1a9d9688dd36dfe09d.tar.bz2 | |
more fixes for windows from Peter Kuemmel
two functional changes:
kdemacros.h:
-# elif defined(_MSC_VER) && (_MSC_VER >= 1300)
+# elif defined(_MSC_VER) && (_MSC_VER >= 1300) && (_MSC_VER < 1400)
dcopidl.bat: since yesterday the unix dcopidl supports the -o <outputfile> parameter to specify the outputfile
this change is to make dcopidl.bat compatible with this behaviour, so now both can be called with the same command line:
dcopidl --srcdir <somedir> -o ksycoca.kidl ksycoca.h
I think it might be a good idea to use the same call scheme also in the other buildsystems
Alex
CCMAIL: Ch.Ehrlicher@gmx.de
CCMAIL: kuemmel@coffeelogic.de
CCMAIL: ralf.habacker@freenet.de
svn path=/trunk/KDE/kdelibs/; revision=505607
| -rw-r--r-- | modules/FindKDE4.cmake | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake index 2f78c381..3176a7c1 100644 --- a/modules/FindKDE4.cmake +++ b/modules/FindKDE4.cmake @@ -81,11 +81,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) SET(KDE4_INCLUDE_DIR ${CMAKE_SOURCE_DIR}) SET(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}) IF (WIN32) - SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) + SET(KDE4_DCOPIDL_EXECUTABLE call ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl.bat ) ELSE (WIN32) SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) ENDIF (WIN32) - SET(KDE4_DCOPIDL_EXECUTABLE ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/dcopidl ) SET(KDE4_KALYPTUS_DIR ${CMAKE_SOURCE_DIR}/dcop/dcopidlng/ ) SET(KDE4_DCOPIDL2CPP_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/dcopidl2cpp ) SET(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/kconfig_compiler ) |