cmake: simplify cmake-gui usage for GNUWIN32

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33887 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/modules/FindGNUWIN32.cmake b/development/cmake/modules/FindGNUWIN32.cmake
index 97617a32456b013a686852c35d7b0224a5dee2ff..9ccec335dcc552400084b8bc9dee86b71d1dec49 100644 (file)
--- a/development/cmake/modules/FindGNUWIN32.cmake
+++ b/development/cmake/modules/FindGNUWIN32.cmake
@@ -2,8 +2,6 @@
 #  from kdelibs
 #
 
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
 if(WIN32)
 
        # check if GNUWIN32_DIR is already set 
@@ -14,15 +12,12 @@ if(WIN32)
                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 gnuwin32 win32libs 
                                        PATHS
                                        "${_progFiles}"
                                        "C:/" "D:/" "E:/" "F:/" "G:/"
                        )
-                       set(GNUWIN32_DIR ${GNUWIN32_DIR_tmp})
                endif()
-       else()
-               set(GNUWIN32_DIR ${GNUWIN32_DIR} CACHE TYPE STRING)
        endif()
 
        if(GNUWIN32_DIR)
@@ -42,7 +37,8 @@ if(WIN32)
                endif()
        else()
                if (GNUWIN32_FIND_REQUIRED)
-                       message(SEND_ERROR "Could NOT find GNUWIN32, please set GNUWIN32_DIR")
+                       set(GNUWIN32_DIR CACHE PATH FORCE)
+                       message(FATAL_ERROR "Could NOT find GNUWIN32, please set GNUWIN32_DIR")
                endif()
        endif()