diff options
| author | Jennifer Leech <jenn@lindenlab.com> | 2008-06-26 19:08:51 +0000 |
|---|---|---|
| committer | Jennifer Leech <jenn@lindenlab.com> | 2008-06-26 19:08:51 +0000 |
| commit | d32c8825b63ca8dc9f1571aefea01cc89eba36e6 (patch) | |
| tree | 6f888fc1110cc63b7ba46a5823eb8befd9419964 /indra/cmake/Variables.cmake | |
| parent | 68edae3f801f633037cf5cee063f65abe081c912 (diff) | |
svn merge -r89701:90677 svn+ssh://svn/svn/linden/branches/install-dev-binaries/s3-build -> release
Diffstat (limited to 'indra/cmake/Variables.cmake')
| -rw-r--r-- | indra/cmake/Variables.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index d06080c7c5..004985d603 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -34,6 +34,11 @@ set(VIEWER_DIR ${CMAKE_SOURCE_DIR}/${VIEWER_PREFIX}) set(LIBS_PREBUILT_DIR ${CMAKE_SOURCE_DIR}/../libraries CACHE PATH "Location of prebuilt libraries.") +if (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) + # We use this as a marker that you can try to use the proprietary libraries. + set(INSTALL_PROPRIETARY ON CACHE BOOL "Install proprietary binaries") +endif (EXISTS ${CMAKE_SOURCE_DIR}/Server.cmake) + if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") set(WINDOWS ON BOOL FORCE) |