diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:32:01 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-09-29 15:32:01 -0400 |
| commit | 9367a3787929dfff8b46763d9a7b4872c469e85a (patch) | |
| tree | db0351a86ebfa362ba8c4314e0db1141fbb46450 /indra/cmake/00-Common.cmake | |
| parent | be9b1ee8afacabb64f82640de5f80ce9438e6c91 (diff) | |
| parent | 17ff449ae6b2759f212daa4fd3de0a7ea2664866 (diff) | |
merge changes for 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. |