From 4e96e04643dfa5fbc56e784c2f85e8636f029252 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Thu, 24 Oct 2013 18:46:00 +0000 Subject: OSX/CMake: fix ftemplate condition --- CMakeLists.txt | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fbb7c17e64b..c34fc5acb31 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1805,13 +1805,9 @@ elseif(APPLE) set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") endif() - if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - if(${CMAKE_GENERATOR} MATCHES "Xcode") - if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) - # Xcode 5 has too low template depth of 128 for libmv - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") - endif() - endif() + if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5) + # Xcode 5 is always using CLANG, which has too low template depth of 128 for libmv + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") endif() endif() -- cgit v1.2.3