]> git.lyx.org Git - features.git/blobdiff - CMakeLists.txt
Remove unneeded files from extract.sh
[features.git] / CMakeLists.txt
index 6cdd52c52fe43084c0fdce877931155388e1832b..b0e3fe17e9b34a3f67d4050bca6d3962ce86c565 100644 (file)
@@ -142,7 +142,6 @@ 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)
 LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
-LYX_COMBO(ENABLE_CXX11          "Build with options for c++11-mode" AUTO ON OFF)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -254,24 +253,10 @@ else()
 endif()
 
 
-if(LYX_ENABLE_CXX11 MATCHES "AUTO")
-  # Set to some meaningful default
-  find_package(CXX11Compiler)
-  if(NOT CXX11COMPILER_FOUND)
-    set(LYX_ENABLE_CXX11 OFF CACHE TYPE STRING FORCE)
-  else()
-    if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-      execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
-        set(LYX_ENABLE_CXX11 ON CACHE TYPE STRING FORCE)
-    else()
-      # Not a gnu compiler
-      if(CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
-        set(LYX_ENABLE_CXX11 ON CACHE TYPE STRING FORCE)
-      else()
-        set(LYX_ENABLE_CXX11 OFF CACHE TYPE STRING FORCE)
-      endif()
-    endif()
-  endif()
+# Set to some meaningful default
+find_package(CXX11Compiler)
+if(NOT CXX11COMPILER_FOUND)
+       message(FATAL_ERROR "A C++11 compatible compiler is required.")
 endif()
 set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
@@ -285,17 +270,9 @@ if(UNIX OR MINGW)
                # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
                set(LYX_USE_STD_REGEX 0)
        else()
-               if (LYX_ENABLE_CXX11)
-                       set(LYX_USE_STD_REGEX 1)
-               endif()
-       endif()
-       if (LYX_ENABLE_CXX11)
-               find_package(CXX11Compiler)
-               if(NOT CXX11COMPILER_FOUND)
-                       message(FATAL_ERROR "A C++11 compatible compiler is required.")
-               endif()
-               set(LYX_GCC11_MODE "${CXX11_FLAG}")
+               set(LYX_USE_STD_REGEX 1)
        endif()
+       set(LYX_GCC11_MODE "${CXX11_FLAG}")
 else()
        set(LYX_USE_STD_REGEX 0)
 #      if(MSVC10)