From 4ada50182f852e8f578680fd7a9346ca1f45c16c Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 22 Nov 2010 16:40:32 -0500
Subject: SH-468 FIX fix of VWR-20810/SNOW-503 lost in merge

re-applying changeset b987077e9bbb as it was lost in the merge.
reviewed the original patch, appears valid.
---
 indra/cmake/LLAddBuildTest.cmake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'indra/cmake')

diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake
index 7c3f1f12e9..79c3bb7da2 100644
--- a/indra/cmake/LLAddBuildTest.cmake
+++ b/indra/cmake/LLAddBuildTest.cmake
@@ -107,7 +107,7 @@ INCLUDE(GoogleMock)
 
     # Setup target
     ADD_EXECUTABLE(PROJECT_${project}_TEST_${name} ${${name}_test_SOURCE_FILES})
-    SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
+    SET_TARGET_PROPERTIES(PROJECT_${project}_TEST_${name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
     #
     # Per-codefile additional / external project dep and lib dep property extraction
@@ -196,7 +196,7 @@ FUNCTION(LL_ADD_INTEGRATION_TEST
     message(STATUS "ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})")
   endif(TEST_DEBUG)
   ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files})
-  SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${EXE_STAGING_DIR})
+  SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}")
 
   # Add link deps to the executable
   if(TEST_DEBUG)
-- 
cgit v1.2.3


From aafd7abd70396d33984b20c25d747406dea422ce Mon Sep 17 00:00:00 2001
From: "Nyx (Neal Orman)" <nyx@lindenlab.com>
Date: Mon, 22 Nov 2010 16:44:58 -0500
Subject: 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.
---
 indra/cmake/Copy3rdPartyLibs.cmake | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'indra/cmake')

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)
-- 
cgit v1.2.3