diff options
| author | Callum Prentice <callum@gmail.com> | 2017-01-03 09:27:30 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@gmail.com> | 2017-01-03 09:27:30 -0800 |
| commit | 4e904d615cb39c57aecc7e823844e83c6c56bf7f (patch) | |
| tree | 440cd28fcf8029f2980ef1948c509f0acb2a7c08 /indra | |
| parent | da1b3c6d39ac86b45d18a81a6a2b0410b88a824b (diff) | |
| parent | eff6bbea5998f3048a6f5a3ce1faf5ae1a6582da (diff) | |
Automated merge with head of lindenlab/nat_viewer64
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/cmake/Variables.cmake | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 99b19ff07a..e8698ace68 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -9,6 +9,12 @@ # LINUX - Linux # WINDOWS - Windows +# Switches set here and in 00-Common.cmake must agree with +# https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables +# Reading $LL_BUILD is an attempt to directly use those switches. +if ("$ENV{LL_BUILD}" STREQUAL "") + message(FATAL_ERROR "Environment variable LL_BUILD must be set") +endif () # Relative and absolute paths to subtrees. @@ -139,13 +145,6 @@ endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux") if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(DARWIN 1) - # The following must agree with - # https://bitbucket.org/lindenlab/viewer-build-variables/src/tip/variables - # Reading $LL_BUILD is an attempt to directly use those switches. - if ("$ENV{LL_BUILD}" STREQUAL "") - message(FATAL_ERROR "Environment variable LL_BUILD must be set") - endif () - string(REGEX MATCH "-mmacosx-version-min=([^ ]+)" scratch "$ENV{LL_BUILD}") set(CMAKE_OSX_DEPLOYMENT_TARGET "${CMAKE_MATCH_1}") message(STATUS "CMAKE_OSX_DEPLOYMENT_TARGET = '${CMAKE_OSX_DEPLOYMENT_TARGET}'") |