csv2lyx: use universal newlines when reading CSVs

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e72aad5e15adb89673b72f8c5b08b2c4f098027b..023c3e14b71e9d51a766724c9f924e6fffc395b7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -213,11 +213,11 @@ if(UNIX OR MINGW)
                set(LYX_USE_TR1_REGEX 0)
        endif()
        if (LYX_ENABLE_CXX11)
-               if(GCC_VERSION VERSION_GREATER 4.7)
-                       set(LYX_GCC11_MODE "-std=gnu++11")
-               elseif(GCC_VERSION VERSION_GREATER 4.2)
-                       set(LYX_GCC11_MODE "-std=gnu++0x")
+               find_package(CXX11Compiler)
+               if(NOT CXX11COMPILER_FOUND)
+                       message(FATAL_ERROR "A C++11 compatible compiler is required.")
                endif()
+               set(LYX_GCC11_MODE "${CXX11_FLAG}")
        endif()
 else()
        if(MSVC10)
@@ -469,8 +469,12 @@ if(NOT MSVC)
        endif()
 endif()
 
+set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of extra cxx compile flags, like '-Werror'")
+mark_as_advanced(LYX_CXX_FLAGS_EXTRA)
 if(LYX_CXX_FLAGS_EXTRA)
-       add_definitions(${LYX_CXX_FLAGS_EXTRA})
+       foreach(_flag ${LYX_CXX_FLAGS_EXTRA})
+               add_definitions(${_flag})
+       endforeach()
 endif()
 
 find_package(Qt5Core QUIET)
@@ -702,16 +706,17 @@ endif()
 
 # Xcode compiler
 if (CMAKE_GENERATOR MATCHES Xcode)
-       # Automatically select the Xcode compiler if not set
-       if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
-               # XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
-               if (XCODE_VERSION VERSION_GREATER "3.1")
-                       SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-               ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
-       ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
-
-       # Print the selected compiler version
-    MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
+       if (XCODE_VERSION VERSION_LESS "5.0")
+               # Automatically select the Xcode compiler if not set
+               if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+                       # XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
+                       if (XCODE_VERSION VERSION_GREATER "3.1")
+                               SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+                       ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
+               ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+               # Print the selected compiler version
+       MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
+       ENDIF(XCODE_VERSION VERSION_LESS "5.0")
 ENDIF(CMAKE_GENERATOR MATCHES Xcode)
 
 if (WIN32 AND Qt5Core_FOUND)