Cmake tests: Get rid of use of command 'env', which is not available under Windows.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5db01686744db1ea6eea9996a010148c52b96544..a25f5480b63cd604a6d936200ec791fc770f1c07 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,6 +47,7 @@ if(COMMAND cmake_policy)
                # COMPILE_DEFINITIONS are not used yet. Enable new behavior.
                cmake_policy(SET CMP0043 NEW)
        endif()
+       cmake_policy(SET CMP0020 OLD)
 endif()
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@@ -246,7 +247,7 @@ endif()
 
 set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
-       execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+       execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
        message(STATUS "Using GCC version ${GCC_VERSION}")
        if(GCC_VERSION VERSION_LESS 4.9)
                # <regex> in gcc is unusable in versions less than 4.9.0
@@ -542,9 +543,9 @@ if(LYX_CXX_FLAGS_EXTRA)
 endif()
 
 if(LYX_XMINGW)
-    set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
-    list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
+       list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
+
 if(LYX_USE_QT MATCHES "QT5")
        find_package(Qt5Core REQUIRED)
        if (Qt5Core_FOUND)
@@ -567,6 +568,10 @@ if(LYX_USE_QT MATCHES "QT5")
                message(STATUS "Found Qt-Version ${QTVERSION}")
        endif()
 elseif(LYX_USE_QT MATCHES "QT4")
+       if(LYX_XMINGW)
+               set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
+               list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
+       endif()
        find_package(Qt4 "4.5.0" REQUIRED)
        macro (qt_use_modules)
        endmacro()