aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/FindGNUWIN32.cmake4
-rw-r--r--modules/FindKDE4Internal.cmake4
2 files changed, 5 insertions, 3 deletions
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake
index f9f0d4d6..fde43d99 100644
--- a/modules/FindGNUWIN32.cmake
+++ b/modules/FindGNUWIN32.cmake
@@ -15,7 +15,7 @@ if(NOT GNUWIN32_DIR)
if(NOT GNUWIN32_DIR)
# search in the default program install folder
file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles)
- find_file(GNUWIN32_DIR_tmp gnuwin32 win32libs
+ find_file(GNUWIN32_DIR_tmp gnuwin32 kdewin32 win32libs
PATHS
"${_progFiles}"
"C:/" "D:/" "E:/" "F:/" "G:/"
@@ -41,7 +41,7 @@ if (GNUWIN32_FOUND)
endif (NOT GNUWIN32_FIND_QUIETLY)
else (GNUWIN32_FOUND)
if (GNUWIN32_FIND_REQUIRED)
- message(SEND_ERROR "Could NOT find GNUWIN32")
+ message(FATAL_ERROR "Could NOT find GNUWIN32")
endif (GNUWIN32_FIND_REQUIRED)
endif (GNUWIN32_FOUND)
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 503e7fa8..12f247b2 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -504,7 +504,9 @@ if (WIN32)
endif(CYGWIN)
find_package(KDEWIN32 REQUIRED)
-
+
+ # is GnuWin32 required or does e.g. Visual Studio provide an own implementation?
+ #find_package(GNUWIN32 REQUIRED)
find_package(GNUWIN32)
set( _KDE4_PLATFORM_INCLUDE_DIRS ${KDEWIN32_INCLUDES} ${GNUWIN32_INCLUDE_DIR})