diff options
| -rw-r--r-- | modules/FindGNUWIN32.cmake | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/modules/FindGNUWIN32.cmake b/modules/FindGNUWIN32.cmake index c5128dd5..7f810481 100644 --- a/modules/FindGNUWIN32.cmake +++ b/modules/FindGNUWIN32.cmake @@ -1,15 +1,21 @@ if (WIN32) +# check if GNUWIN32_DIR is already set +# (e.g. by command line argument or the calling script) if(NOT GNUWIN32_DIR) - file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles) + # check for enviroment variable + file(TO_CMAKE_PATH "$ENV{GNUWIN32_DIR}" GNUWIN32_DIR) + if(NOT GNUWIN32_DIR) + # search in the default program install folder + file(TO_CMAKE_PATH "$ENV{PROGRAMFILES}" _progFiles) + find_file(GNUWIN32_DIR gnuwin32 win32libs + PATHS + "${_progFiles}" + "C:/" + ) + endif(NOT GNUWIN32_DIR) endif(NOT GNUWIN32_DIR) -find_file(GNUWIN32_DIR gnuwin32 win32libs - PATHS - "${_progFiles}" - "C:/" "D:/" "E:/" "F:/" "G:/" -) - if (GNUWIN32_DIR) set(GNUWIN32_INCLUDE_DIR ${GNUWIN32_DIR}/include) set(GNUWIN32_LIBRARY_DIR ${GNUWIN32_DIR}/lib) |