diff options
| author | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
|---|---|---|
| committer | Aura Linden <aura@lindenlab.com> | 2015-10-01 09:35:58 -0700 |
| commit | 40316f8431279d925bc677a7e2ef7b4d79bc843a (patch) | |
| tree | 218b97ae3d0173a9b8c106c09306aef03f42c7f6 /indra/cmake/00-Common.cmake | |
| parent | a4fef135b110045500d9afc1b558127bc2f5cd89 (diff) | |
| parent | 6c422a881499c0d7649a59db47905a584bbd2bc1 (diff) | |
Pulled merge to use xcode 7.
Diffstat (limited to 'indra/cmake/00-Common.cmake')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 7a320ffc59..1a3b6c5117 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -191,7 +191,7 @@ if (DARWIN) add_definitions(-DLL_DARWIN=1) set(CMAKE_CXX_LINK_FLAGS "-Wl,-no_compact_unwind -Wl,-headerpad_max_install_names,-search_paths_first") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}") - set(DARWIN_extra_cstar_flags "-g") + set(DARWIN_extra_cstar_flags "-g -Wno-unused-local-typedef -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${DARWIN_extra_cstar_flags}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${DARWIN_extra_cstar_flags}") # NOTE: it's critical that the optimization flag is put in front. |