diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:08:13 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-04-22 16:08:13 -0400 |
| commit | 5870788f68c6b1fb504ae95403e7da95bc55ed4c (patch) | |
| tree | f714e60f262f905e743e944ee4ca062fe48e6ccb /indra | |
| parent | d00d37d23b68037fed8eeeffe21a87f7597086c3 (diff) | |
catch a few more cases of STANDALONE -> USESYSTEMLIBS
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 2 | ||||
| -rwxr-xr-x | indra/cmake/Prebuilt.cmake | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 69173c38a2..335dd89080 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -226,7 +226,7 @@ endif (LINUX OR DARWIN) if (USESYSTEMLIBS) - add_definitions(-DLL_STANDALONE=1) + add_definitions(-DLL_USESYSTEMLIBS=1) if (LINUX AND ${ARCH} STREQUAL "i686") add_definitions(-march=pentiumpro) diff --git a/indra/cmake/Prebuilt.cmake b/indra/cmake/Prebuilt.cmake index c3fd8f1666..e548805148 100755 --- a/indra/cmake/Prebuilt.cmake +++ b/indra/cmake/Prebuilt.cmake @@ -17,11 +17,11 @@ endif(INSTALL_PROPRIETARY) # of previous attempts is serialized in the file # ${CMAKE_BINARY_DIR}/temp/${_binary}_installed) macro (use_prebuilt_binary _binary) - if (NOT DEFINED STANDALONE_${_binary}) - set(STANDALONE_${_binary} ${USESYSTEMLIBS}) - endif (NOT DEFINED STANDALONE_${_binary}) + if (NOT DEFINED USESYSTEMLIBS_${_binary}) + set(USESYSTEMLIBS_${_binary} ${USESYSTEMLIBS}) + endif (NOT DEFINED USESYSTEMLIBS_${_binary}) - if (NOT STANDALONE_${_binary}) + if (NOT USESYSTEMLIBS_${_binary}) if("${${_binary}_installed}" STREQUAL "" AND EXISTS "${CMAKE_BINARY_DIR}/temp/${_binary}_installed") file(READ ${CMAKE_BINARY_DIR}/temp/${_binary}_installed "${_binary}_installed") if(DEBUG_PREBUILT) @@ -52,7 +52,7 @@ macro (use_prebuilt_binary _binary) "Failed to download or unpack prebuilt '${_binary}'." " Process returned ${${_binary}_installed}.") endif (NOT ${_binary}_installed EQUAL 0) - endif (NOT STANDALONE_${_binary}) + endif (NOT USESYSTEMLIBS_${_binary}) endmacro (use_prebuilt_binary _binary) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) |