csv2lyx: use universal newlines when reading CSVs

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f94625c33c3251c571ca79a410c6e8ad3285f3..023c3e14b71e9d51a766724c9f924e6fffc395b7 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -706,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)