diff options
| author | Oz Linden <oz@lindenlab.com> | 2014-03-19 17:30:07 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2014-03-19 17:30:07 -0400 |
| commit | 776aadf4ef65681084268c3866058172c89b4259 (patch) | |
| tree | 319c598d928b244047aabce1a8833f516f03b728 /indra/cmake/00-Common.cmake | |
| parent | cb2bd577099f87881d467249cac679200bb367f0 (diff) | |
OPEN-199: replace the confusing STANDALONE switch with USESYSTEMLIBS
Diffstat (limited to 'indra/cmake/00-Common.cmake')
| -rwxr-xr-x | indra/cmake/00-Common.cmake | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake index 87484f4ae3..69173c38a2 100755 --- a/indra/cmake/00-Common.cmake +++ b/indra/cmake/00-Common.cmake @@ -173,12 +173,12 @@ if (LINUX) endif (WORD_SIZE EQUAL 32) add_definitions(-mfpmath=sse) #add_definitions(-ftree-vectorize) # THIS CRASHES GCC 3.1-3.2 - if (NOT STANDALONE) + if (NOT USESYSTEMLIBS) # this stops us requiring a really recent glibc at runtime add_definitions(-fno-stack-protector) # linking can be very memory-hungry, especially the final viewer link set(CMAKE_CXX_LINK_FLAGS "-Wl,--no-keep-memory") - endif (NOT STANDALONE) + endif (NOT USESYSTEMLIBS) set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}") set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}") @@ -225,14 +225,14 @@ if (LINUX OR DARWIN) endif (LINUX OR DARWIN) -if (STANDALONE) +if (USESYSTEMLIBS) add_definitions(-DLL_STANDALONE=1) if (LINUX AND ${ARCH} STREQUAL "i686") add_definitions(-march=pentiumpro) endif (LINUX AND ${ARCH} STREQUAL "i686") -else (STANDALONE) +else (USESYSTEMLIBS) set(${ARCH}_linux_INCLUDES ELFIO atk-1.0 @@ -241,6 +241,6 @@ else (STANDALONE) gtk-2.0 pango-1.0 ) -endif (STANDALONE) +endif (USESYSTEMLIBS) endif(NOT DEFINED ${CMAKE_CURRENT_LIST_FILE}_INCLUDED) |