Update previews after doing a find/replace (#7242)

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5409746276c38fa259d8480ca71a5958dfe7059e..785e37e7d4e7a1b90deda12eec884746c113de72 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -246,12 +246,11 @@ 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}")
-# disabled because of missing match_partial
-#      if(GCC_VERSION VERSION_LESS 4.9)
+       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()
+       endif()
        if (LYX_ENABLE_CXX11)
                find_package(CXX11Compiler)
                if(NOT CXX11COMPILER_FOUND)
@@ -260,7 +259,6 @@ if(UNIX OR MINGW)
                set(LYX_GCC11_MODE "${CXX11_FLAG}")
        endif()
 else()
-# disabled because of missing match_partial
        set(LYX_USE_STD_REGEX 0)
 #      if(MSVC10)
 #              set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
@@ -610,8 +608,24 @@ foreach(_spell "ASPELL" "Enchant" "Hunspell")
   endif()
 endforeach()
 
+find_package(PythonInterp 2.7 QUIET)
+if(PYTHONINTERP_FOUND)
+  if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+    unset(PYTHONINTERP_FOUND)
+  endif()
+endif()
+
+if (NOT PYTHONINTERP_FOUND)
+  unset(PYTHON_EXECUTABLE CACHE)
+  unset(PYTHON_VERSION_MAJOR)
+  unset(PYTHON_VERSION_MINOR)
+  unset(PYTHON_VERSION_STRING)
+  find_package(PythonInterp 3.3 REQUIRED)
+endif()
+
+set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+
 if(LYX_NLS)
-       FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python)
        find_package(LyXGettext)
        if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)
                add_subdirectory(po "${TOP_BINARY_DIR}/po")
@@ -632,7 +646,11 @@ find_package(ZLIB REQUIRED)
 
 if(LYX_EXTERNAL_BOOST)
        message(STATUS "Searching for boost")
-       find_package(Boost COMPONENTS signals regex) #TODO could REQUIRED be used
+       if(LYX_USE_STD_REGEX)
+               find_package(Boost COMPONENTS signals)
+       else()
+               find_package(Boost COMPONENTS signals regex)
+       endif()
        if(Boost_FOUND)
                message(STATUS "Boost found")
                message(STATUS "Boost-libs = ${Boost_LIBRARIES}")