From 0a3ffd6c02d52f7d331bea61a476715a7dfb38c8 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Wed, 11 Oct 2017 21:53:18 +0200 Subject: [PATCH] Use the previous version to set the compiler flags for Windows or the compile command line will be screwed up royally --- indra/cmake/00-Common.cmake | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index f006676635..e88b6e183c 100644 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -19,7 +19,14 @@ 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}") +# Use the previous version for Windows or the compile command line will be screwed up royally +if (WINDOWS) + 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}") +else (WINDOWS) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} $ENV{LL_BUILD}") +endif (WINDOWS) # 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