From 40eafd6dc1fbf76983eca88c7ad3bcec300ffcc8 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 3 Feb 2006 23:12:44 +0000
Subject: more fixes for windows...

Alex

svn path=/trunk/KDE/kdelibs/; revision=505471
---
 modules/FindKDE4.cmake   |  5 +++++
 modules/KDE4Macros.cmake | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index a3f42d40..2f78c381 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -80,6 +80,11 @@ 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 )
+  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 )
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 93af113f..cb0657e5 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -32,6 +32,14 @@ MACRO(KDE4_ADD_FILE_DEPENDANCY file)
 ENDMACRO(KDE4_ADD_FILE_DEPENDANCY)
 
 
+IF (UNIX)
+   # dcopidl needs the redirection under unix
+   SET (_KDE4_GT ">")
+ELSE (UNIX)
+   # but not under windows
+   SET (_KDE4_GT )
+ENDIF (UNIX)
+
 #create the kidl and skeletion file for dcop stuff
 #usage: KDE_ADD_COP_SKELS(foo_SRCS ${dcop_headers})
 MACRO(KDE4_ADD_DCOP_SKELS _sources)
@@ -49,7 +57,7 @@ MACRO(KDE4_ADD_DCOP_SKELS _sources)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
            COMMAND ${KDE4_DCOPIDL_EXECUTABLE}
-           ARGS --srcdir ${KDE4_KALYPTUS_DIR} ${_tmp_FILE} > ${_kidl}
+           ARGS --srcdir ${KDE4_KALYPTUS_DIR} ${_tmp_FILE} ${_KDE4_GT} ${_kidl}
            DEPENDS ${_tmp_FILE}
         )
       ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
@@ -88,7 +96,7 @@ MACRO(KDE4_ADD_DCOP_STUBS _sources)
 
         ADD_CUSTOM_COMMAND(OUTPUT ${_kidl}
            COMMAND ${KDE4_DCOPIDL_EXECUTABLE}
-           ARGS --srcdir ${KDE4_KALYPTUS_DIR} ${_tmp_FILE} > ${_kidl}
+           ARGS --srcdir ${KDE4_KALYPTUS_DIR} ${_tmp_FILE} ${_KDE4_GT} ${_kidl}
            DEPENDS ${_tmp_FILE}
         )
       ENDIF (NOT HAVE_${_basename}_KIDL_RULE)
-- 
cgit v1.2.1