diff options
| author | Mark Palange <palange@lindenlab.com> | 2008-07-03 21:10:36 +0000 |
|---|---|---|
| committer | Mark Palange <palange@lindenlab.com> | 2008-07-03 21:10:36 +0000 |
| commit | 1d12a5c20a382ce94dec5f5b388267f62c7c549b (patch) | |
| tree | f9ebd8bd9e79f5b804bbc3078e2e98ee21b0d830 | |
| parent | e6dcb705a557e25b5cc0c132b60de42ea0acf440 (diff) | |
DEV-17460 updated the cmake SERVER variable init to work reliably
| -rw-r--r-- | indra/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | indra/cmake/Variables.cmake | 4 |
2 files changed, 12 insertions, 3 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt index 3e6bcb00e6..db338508a3 100644 --- a/indra/CMakeLists.txt +++ b/indra/CMakeLists.txt @@ -70,7 +70,16 @@ if (VIEWER) add_dependencies(viewer secondlife-bin) endif (VIEWER) -add_custom_target(server) +# Linux builds the viewer and server in 2 separate projects +# In order for ./develop.py build server to work on linux, +# the viewer project needs a server target. +# This is not true for mac and windows. +if (LINUX) + add_custom_target(server) +endif (LINUX) if (SERVER) + if (NOT LINUX) + add_custom_target(server) + endif (NOT LINUX) include(${SERVER_PREFIX}Server.cmake) endif (SERVER) diff --git a/indra/cmake/Variables.cmake b/indra/cmake/Variables.cmake index 004985d603..e537772fa5 100644 --- a/indra/cmake/Variables.cmake +++ b/indra/cmake/Variables.cmake @@ -81,9 +81,9 @@ set(VIEWER ON CACHE BOOL "Build Second Life viewer.") set(STANDALONE OFF CACHE BOOL "Do not use Linden-supplied prebuilt libraries.") -if (NOT STANDALONE AND EXISTS ${LIBS_PREBUILT_DIR}/include/havok) +if (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) set(SERVER ON CACHE BOOL "Build Second Life server software.") -endif (NOT STANDALONE AND EXISTS ${LIBS_PREBUILT_DIR}/include/havok) +endif (NOT STANDALONE AND EXISTS ${CMAKE_SOURCE_DIR}/llphysics) if (LINUX AND SERVER AND VIEWER) MESSAGE(FATAL_ERROR " |