From 8fd2d55e9cecc281f6da7a86bbff4011c490996a Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Fri, 3 Feb 2006 22:30:30 +0000
Subject: for now the kdeinit stuff is also required on windows, make compiling
 easier for now fix typo in mingw section

Alex



svn path=/trunk/KDE/kdelibs/; revision=505460
---
 modules/FindKDE4.cmake   |  2 +-
 modules/KDE4Macros.cmake | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'modules')

diff --git a/modules/FindKDE4.cmake b/modules/FindKDE4.cmake
index f713e4e7..a3f42d40 100644
--- a/modules/FindKDE4.cmake
+++ b/modules/FindKDE4.cmake
@@ -162,7 +162,7 @@ ENDIF(CYGWIN)
 IF(MINGW)
    SET( QT_AND_KDECORE_LIBS ${QT_AND_KDECORE_LIBS} kdewin32 )
    SET(_KDE4_PLATFORM_INCLUDE_DIRS ${KDE4_INCLUDE_DIR}/win/include  ${KDE4_INCLUDE_DIR}/include/mingw )
-   SET( CMAKE_INCLUDE_PATH ${${KDE4_INCLUDE_DIR}/win/include ${KDE4_INCLUDE_DIR}/win/include/mingw )
+   SET( CMAKE_INCLUDE_PATH ${KDE4_INCLUDE_DIR}/win/include ${KDE4_INCLUDE_DIR}/win/include/mingw )
 ENDIF(MINGW)
 
 
diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake
index 682eae4c..93af113f 100644
--- a/modules/KDE4Macros.cmake
+++ b/modules/KDE4Macros.cmake
@@ -442,10 +442,10 @@ MACRO(KDE4_ADD_KLM _target_NAME )
 
    CONFIGURE_FILE(${KDE4_MODULE_DIR}/kde4init_dummy.cpp.in ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
    
-   IF (WIN32)
-      # under windows, just build a normal executable
-      KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} )
-   ELSE (WIN32)
+#   IF (WIN32)
+#      # under windows, just build a normal executable
+#      KDE4_ADD_EXECUTABLE(${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${ARGN} )
+#   ELSE (WIN32)
       # under UNIX, create a shared library and a small executable, which links to this library
       IF (KDE4_ENABLE_FINAL)
          KDE4_CREATE_FINAL_FILES(${_target_NAME}_final_cpp.cpp ${_target_NAME}_final_c.c ${ARGN})
@@ -458,7 +458,7 @@ MACRO(KDE4_ADD_KLM _target_NAME )
 
       ADD_EXECUTABLE( ${_target_NAME} ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp )
       TARGET_LINK_LIBRARIES( ${_target_NAME} kdeinit_${_target_NAME} )
-   ENDIF (WIN32)
+#   ENDIF (WIN32)
 
 ENDMACRO(KDE4_ADD_KLM _target_NAME)
 
-- 
cgit v1.2.1