X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=ae43c8933de56959bb0ab5da0657ebcc093c4a96;hb=064834e468c263aaa4f169248b697d0ff0714b68;hp=bdf7ae0aad131a273572ae3bf1eb75663c32bc92;hpb=81701e1dc84a1a3ebe1087db535734e690c550ce;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bdf7ae0aad..ae43c8933d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -443,7 +443,7 @@ if(LYX_HUNSPELL)
 endif()
 
 if(LYX_NLS)
-	FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python HINTS ${GNUWIN32_DIR}/python)
+	FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python)
 	if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
 		message(FATAL_ERROR "Python 2.6 needed!")
 	endif()
@@ -625,6 +625,21 @@ if(LYX_DEBUG_GLIBC_PEDANTIC)
 	set(_GLIBCXX_DEBUG_PEDANTIC ON)
 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}")
+ENDIF(CMAKE_GENERATOR MATCHES Xcode)
+
+
 # compiler tests, config.h generation
 if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
 	configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h)