From b9853f8e0928e7ef17f80021f9f31eb0161b6169 Mon Sep 17 00:00:00 2001
From: Aimee Linden <aimee@lindenlab.com>
Date: Thu, 19 Aug 2010 13:31:45 +0100
Subject: [PATCH] VWR-20809 (SNOW-504) Do not depend on stage_thirds_party_libs
for a standalone build.
---
doc/contributions.txt | 3 ++-
indra/cmake/Copy3rdPartyLibs.cmake | 12 +++++++-----
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/doc/contributions.txt b/doc/contributions.txt
index e124a68df4b..ac42542ebcf 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -520,10 +520,11 @@ Robin Cornelius
SNOW-108
SNOW-204
SNOW-484
+ SNOW-504
SNOW-506
+ SNOW-507
SNOW-514
SNOW-520
- SNOW-507
SNOW-585
VWR-2488
VWR-9557
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 89422fbdb2d..2dd296bf121 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -286,7 +286,7 @@ copy_if_different(
${vivox_src_dir}
"${SHARED_LIB_STAGING_DIR_DEBUG}"
out_targets
- ${vivox_files}
+ ${vivox_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
@@ -391,7 +391,9 @@ if(NOT EXISTS ${internal_llkdu_path})
endif (NOT EXISTS ${internal_llkdu_path})
-add_custom_target(stage_third_party_libs ALL
- DEPENDS
- ${third_party_targets}
- )
+if(NOT STANDALONE)
+ add_custom_target(
+ stage_third_party_libs ALL
+ DEPENDS ${third_party_targets}
+ )
+endif(NOT STANDALONE)
--
GitLab