X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=a25f5480b63cd604a6d936200ec791fc770f1c07;hb=e430586ec36e2bb1646191682f434e45fb871d26;hp=a925a9e8e5e3e5a19abd7c03bf865ce10bc6b32c;hpb=0c3624e36a132597eff544e482a1d28e06de0d12;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a925a9e8e5..a25f5480b6 100644
--- 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)
@@ -134,6 +135,7 @@ LYX_OPTION(BUNDLE           "Build bundle  (experimental) " OFF ALL)
 LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
 LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
+LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -142,7 +144,6 @@ LYX_OPTION(PROGRAM_SUFFIX       "Append version suffix to binaries" ON GCC)
 LYX_OPTION(DEBUG_GLIBC          "Enable libstdc++ debug mode" OFF GCC)
 LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++ pedantic debug mode" OFF GCC)
 LYX_OPTION(STDLIB_DEBUG         "Use debug stdlib" OFF GCC)
-LYX_OPTION(CONCEPT_CHECKS       "Enable concept-checks" OFF GCC)
 LYX_OPTION(PROFILE              "Build with options for gprof" OFF GCC)
 LYX_OPTION(ENABLE_CXX11         "Build with options for c++11-mode" OFF GCC)
 
@@ -156,11 +157,6 @@ LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
 # APPLE specific
 LYX_OPTION(DMG                   "Build as Mac bundle, needed for .dmg  (experimental) " OFF MAC)
 LYX_OPTION(COCOA                 "Use Cocoa on Mac" OFF MAC)
-if(LYX_XMINGW)
-  LYX_COMBO(USE_QT               "Use Qt version as frontend for MINGW" QT4)
-else()
-  LYX_COMBO(USE_QT               "Use Qt version as frontend" QT4 QT5)
-endif()
 
 
 if(help OR HELP)
@@ -251,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
@@ -529,9 +525,6 @@ if(NOT MSVC)
 	if(LYX_STDLIB_DEBUG)
 		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
 	endif()
-	if(LYX_CONCEPT_CHECKS)
-		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
-	endif()
 	set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
 	set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
 	if(MINGW)
@@ -550,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)
@@ -575,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()