summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-11-22 16:44:58 -0500
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-11-22 16:44:58 -0500
commitaafd7abd70396d33984b20c25d747406dea422ce (patch)
treef9ba39a01b54798ba6caff510d0b4a3f371ffa19 /indra
parent4ada50182f852e8f578680fd7a9346ca1f45c16c (diff)
SH-467 FIX fix of VWR-20809/SNOW-504 lost in merge
re-applying the fix originally committed as c5ddd1e361ae. This allows standalone builds to not depend on stage_third_party_libs but was lost in a merge as referenced in jira. Re-reviewed the code in the patch and it is a valid fix.
Diffstat (limited to 'indra')
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake12
1 files changed, 7 insertions, 5 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 93cdf3422c..85bb281354 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -295,7 +295,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})
@@ -376,7 +376,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)