summaryrefslogtreecommitdiff
path: root/indra/cmake
diff options
context:
space:
mode:
authorCallum Prentice <callum@gmail.com>2017-05-04 16:05:59 -0700
committerCallum Prentice <callum@gmail.com>2017-05-04 16:05:59 -0700
commit0288e5e8cfaf66c8a8b6407ec05193238987002a (patch)
treefba974f858b09d61d6cf9fdc45c2437a1c54dddf /indra/cmake
parent35cec8fec8fef36a75bbb168e38c235ff0c47b49 (diff)
Expand the way we set C++ flags in cmake to call out each build type explicitly
Diffstat (limited to 'indra/cmake')
-rw-r--r--indra/cmake/00-Common.cmake4
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