Use std::regex if possible

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 55b83220c56391af137e0fe22d73e5ffaf844cb9..294dbe4c1e3bce58226f0ca9acc317f3ebb4fc3c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,11 +246,10 @@ set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
        execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
        message(STATUS "Using GCC version ${GCC_VERSION}")
-       if(NOT GCC_VERSION VERSION_LESS 4.4)
-               set(LYX_USE_TR1 1)
-               # GCC <= 4.5 does not support regex: there are linker errors
-               # http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.tr1
-               set(LYX_USE_TR1_REGEX 0)
+       if(GCC_VERSION VERSION_LESS 4.9)
+               # <regex> in gcc is unusable in versions less than 4.9.0
+               # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+               set(LYX_USE_STD_REGEX 0)
        endif()
        if (LYX_ENABLE_CXX11)
                find_package(CXX11Compiler)
@@ -260,10 +259,10 @@ if(UNIX OR MINGW)
                set(LYX_GCC11_MODE "${CXX11_FLAG}")
        endif()
 else()
-       if(MSVC10)
-               set(LYX_USE_TR1 1)
-               #set(LYX_USE_TR1_REGEX 1) #TODO should we use it in ECMAScript mode?
-       endif()
+       set(LYX_USE_STD_REGEX 0)
+#      if(MSVC10)
+#              set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
+#      endif()
 endif()
 
 
@@ -314,29 +313,26 @@ foreach(_c_l ${_config_lines} )
        endif()
 endforeach(_c_l)
 
-if (LYX_LOCALVERSIONING)
-       # Find the revision number and for later use
-       FIND_PROGRAM(LYX_GITVERSION git)
-       #message(STATUS "gitversion = ${LYX_GITVERSION}")
-       if(LYX_GITVERSION)
-               EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
-                WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-               if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
-                 # We will add offset of 40000 to get appropriate value to
-                 # previous svn.
-                 # We use this value than also to set the package-patch-value
-                 MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
-                 set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
-                  set(ENABLE_DIST ON)
-               endif()
-       else()
-               set(LYX_REVISION_VERSION git) #TODO use date
-       endif()
-else()
-       set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+FIND_PROGRAM(LYX_GITVERSION git)
+#message(STATUS "gitversion = ${LYX_GITVERSION}")
+set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+if(LYX_GITVERSION)
+  if (LYX_LOCALVERSIONING)
+    # Find the revision number and for later use
+    EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
+      WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
+      # We will add offset of 40000 to get appropriate value to
+      # previous svn.
+      # We use this value than also to set the package-patch-value
+      MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
+      set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
+      set(ENABLE_DIST ON)
+    endif()
+  endif()
 endif()
 
-# Set the programs (lyx, tex2lyx, etc.) suffix 
+# Set the programs (lyx, tex2lyx, etc.) suffix
 # When building an OS X bundle, we will append
 # the suffix only to the bundle, not to the programs
 set(PROGRAM_SUFFIX "")
@@ -476,8 +472,8 @@ if(NOT GROUP_CODE)
 endif()
 
 # lyx's source files
-set(LYX_CPP_FILES *.cpp)
-set(LYX_HPP_FILES *.h)
+set(LYX_CPP_FILES [a-zA-Z]*.cpp)
+set(LYX_HPP_FILES [a-zA-Z]*.h)
 set(LYX_MOC_FILES moc_*.cpp)
 
 include(ProjectSourceGroup)
@@ -555,10 +551,10 @@ if(LYX_USE_QT MATCHES "QT5")
        if (Qt5Core_FOUND)
                find_package(Qt5Widgets REQUIRED)
                if(APPLE)
-                       find_package(Qt5MacExtras)
-               elseif(UNIX)
-                       find_package(Qt5X11Extras)
+                       find_package(Qt5MacExtras REQUIRED)
                endif()
+               find_package(Qt5X11Extras QUIET)
+               find_package(Qt5WinExtras QUIET)
                set(QTVERSION ${Qt5Core_VERSION})
                macro (qt_use_modules)
                        qt5_use_modules(${ARGN})
@@ -569,6 +565,7 @@ if(LYX_USE_QT MATCHES "QT5")
                macro (qt_wrap_uifiles)
                        qt5_wrap_ui(${ARGN})
                endmacro()
+               message(STATUS "Found Qt-Version ${QTVERSION}")
        endif()
 elseif(LYX_USE_QT MATCHES "QT4")
        find_package(Qt4 "4.5.0" REQUIRED)
@@ -642,7 +639,7 @@ if(LYX_EXTERNAL_BOOST)
                message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
        endif()
 else()
-       if(LYX_USE_TR1_REGEX)
+       if(LYX_USE_STD_REGEX)
                set(Lyx_Boost_Libraries boost_signals)
        else()
                set(Lyx_Boost_Libraries boost_signals boost_regex)