From 1d12a5c20a382ce94dec5f5b388267f62c7c549b Mon Sep 17 00:00:00 2001
From: Mark Palange <palange@lindenlab.com>
Date: Thu, 3 Jul 2008 21:10:36 +0000
Subject: [PATCH] DEV-17460 updated the cmake SERVER variable init to work
reliably
---
indra/CMakeLists.txt | 11 ++++++++++-
indra/cmake/Variables.cmake | 4 ++--
2 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 3e6bcb00e63..db338508a33 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 004985d6031..e537772fa5e 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 "
--
GitLab