From afe0713330569133407e3f1a9d9688dd36dfe09d Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Sat, 4 Feb 2006 14:22:36 +0000 Subject: 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 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 -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 --- modules/FindKDE4.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'modules') 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 ) -- cgit v1.2.1