anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 01:59:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: simplify cmake-gui usage for GNUWIN32

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33887 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-03-28 12:18:03 +00:00
parent 8c115c7185
commit ff12bc6990
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
development/cmake/modules/FindGNUWIN32.cmake
View File

@ -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()