diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-09-10 23:23:39 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-09-10 23:23:39 +0400 |
| commit | 92d94ccb084df36ab7fd39f0258a7189356d9966 (patch) | |
| tree | 0cc07aae4dd1b24f2412b289d8dc5d4cff22bf01 /CMakeLists.txt | |
| parent | ba13c1606510a5bc92504698f3c4edad53d4480b (diff) | |
misc minor changes
- make cmake osx use of -ftemplate-depth match scons.
- use array size within sizeof(), more compact.
- replace AT with __func__ where the function is unique enough.
- BLI_box_pack_2D -> 2d to match other functions.
- rename new mesh normal calculation to mesh.calc_normals_split()
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 96853353dbe..caaf913f163 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1784,8 +1784,14 @@ elseif(APPLE) set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing") endif() - # Xcode 5 has too low template depth of 128 for libmv - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024") + 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() + endif() endif() #----------------------------------------------------------------------------- |