X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=a87b049357d195c3f2317321b4fe25981567aa25;hb=c9f6ed309f04731128389c4db5dc50b5524fda83;hp=5db01686744db1ea6eea9996a010148c52b96544;hpb=2aba6448a715c4375310b05a3892ff68b191717e;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5db0168674..a87b049357 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -40,6 +40,9 @@ if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0005 OLD)
 	# Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
 	cmake_policy(SET CMP0006 NEW)
+	if(POLICY CMP0020)
+		cmake_policy(SET CMP0020 OLD)
+	endif()
 	if(POLICY CMP0028)
 		cmake_policy(SET CMP0028 OLD)
 	endif()
@@ -246,7 +249,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 +545,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 +570,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()