anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 02:49:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

avoid CMAKE_XCODE_ATTRIBUTE_GCC_VERSION assignment for Xcode 5.0+

Browse Source 
it is not needed anymore and the current assignment is wrong in this case
This commit is contained in:
Stephan Witt 2013-12-31 10:24:27 +01:00
parent c1c35ca19e
commit 130ad13dee
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
CMakeLists.txt
View File

@ -706,16 +706,17 @@ endif()
# Xcode compiler # Xcode compiler
if (CMAKE_GENERATOR MATCHES Xcode) if (CMAKE_GENERATOR MATCHES Xcode)
# Automatically select the Xcode compiler if not set if (NOT XCODE_VERSION VERSION_GREATER "5.0")
if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) # Automatically select the Xcode compiler if not set
# XCode >= 3.1 has gcc 4.2 (up to actual Xcode) if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
if (XCODE_VERSION VERSION_GREATER "3.1") # XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") if (XCODE_VERSION VERSION_GREATER "3.1")
ENDIF(XCODE_VERSION VERSION_GREATER "3.1") SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
# Print the selected compiler version # Print the selected compiler version
MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}") MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
ENDIF(NOT XCODE_VERSION VERSION_GREATER "5.0")
ENDIF(CMAKE_GENERATOR MATCHES Xcode) ENDIF(CMAKE_GENERATOR MATCHES Xcode)
if (WIN32 AND Qt5Core_FOUND) if (WIN32 AND Qt5Core_FOUND)