diff options
| author | nat_linden <nat@lindenlab.com> | 2017-05-04 23:14:20 +0000 |
|---|---|---|
| committer | nat_linden <nat@lindenlab.com> | 2017-05-04 23:14:20 +0000 |
| commit | 322767f98e3c3164e3be03daa85580038ca6fb52 (patch) | |
| tree | a178fd59399c5993da02a55394c629fcd6021065 /indra | |
| parent | 07ec10781e45b3d92e27e92ddad39cf74fa7ff0b (diff) | |
| parent | 0288e5e8cfaf66c8a8b6407ec05193238987002a (diff) | |
Merged in lindenlab/viewer64-callum (pull request #15)
Expand the way we set C++ flags in cmake to call out each build type explicitly
Approved-by: nat_linden <nat@lindenlab.com>
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/00-Common.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f925fdda5d..f792280654 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -19,7 +19,9 @@ set(${CMAKE_CURRENT_LIST_FILE}_INCLUDED "YES") include(Variables) # We go to some trouble to set LL_BUILD to the set of relevant compiler flags. -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}") +set(CMAKE_CXX_FLAGS_RELEASE "$ENV{LL_BUILD_RELEASE}") +set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "$ENV{LL_BUILD_RELWITHDEBINFO}") +set(CMAKE_CXX_FLAGS_DEBUG "$ENV{LL_BUILD_DEBUG}") # Given that, all the flags you see added below are flags NOT present in # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables. # Before adding new ones here, it's important to ask: can this flag really be |