From 8aa32015a9fb66c54a47150bf7348c00cd7b83a1 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 7 Dec 2012 17:47:03 -0500 Subject: Backed out changeset 5cf865a7afa7 --- BuildParams | 3 --- 1 file changed, 3 deletions(-) diff --git a/BuildParams b/BuildParams index f584c63d1a..40ec94ceaa 100644 --- a/BuildParams +++ b/BuildParams @@ -21,9 +21,6 @@ email_status_this_is_os = true codeticket_since = 3.3.0-release clean_on_success = false -run_tests = false -build_Darwin_Debug = false -build_Darwin_RelWithDebInfo = false # ======================================== # Viewer Development -- cgit v1.2.3 From 77f58a7524af6d5b634959cffeb023491ce31d25 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 7 Dec 2012 17:48:10 -0500 Subject: Backed out changeset 227671259809. --- BuildParams | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BuildParams b/BuildParams index 40ec94ceaa..5a69d68074 100644 --- a/BuildParams +++ b/BuildParams @@ -20,7 +20,7 @@ email_status_this_is_os = true # Limit extent of codeticket updates to revisions after... codeticket_since = 3.3.0-release -clean_on_success = false +build_clean_on_success = false # ======================================== # Viewer Development -- cgit v1.2.3 From 954200e97f0283a2f16d19601129d64fb16449c2 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 7 Dec 2012 17:48:50 -0500 Subject: Backed out changeset 69636bceb5a2. --- BuildParams | 2 -- 1 file changed, 2 deletions(-) diff --git a/BuildParams b/BuildParams index 5a69d68074..ebfc640023 100644 --- a/BuildParams +++ b/BuildParams @@ -20,8 +20,6 @@ email_status_this_is_os = true # Limit extent of codeticket updates to revisions after... codeticket_since = 3.3.0-release -build_clean_on_success = false - # ======================================== # Viewer Development # ======================================== -- cgit v1.2.3 From 7e59b1041336b1044ee1f0120e5eb1ddf4a93506 Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Fri, 7 Dec 2012 19:38:12 -0500 Subject: Removed duplicated block of code in LLAddBuildTest.cmake. Added comment to point to duplicated code. Replaced hard-coded tcmalloc link option with variable that is created in GooglePerfTools.cmake. --- indra/cmake/LLAddBuildTest.cmake | 10 ++-------- indra/llcorehttp/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 543075db5b..21a0c8a9ca 100644 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -201,19 +201,13 @@ FUNCTION(LL_ADD_INTEGRATION_TEST endif(TEST_DEBUG) ADD_EXECUTABLE(INTEGRATION_TEST_${testname} ${source_files}) SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${EXE_STAGING_DIR}") - if (WINDOWS) - set_target_properties(INTEGRATION_TEST_${testname} - PROPERTIES - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" - LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" - LINK_FLAGS_RELEASE "" - ) - endif(WINDOWS) if(STANDALONE) SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}") endif(STANDALONE) + # The following was copied to llcorehttp/CMakeLists.txt's texture_load target. + # Any changes made here should be replicated there. if (WINDOWS) SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 82fb3f0d4e..9adfd0ed62 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -174,7 +174,7 @@ if (LL_TESTS) # The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target. set_target_properties(http_texture_load PROPERTIES - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_RELEASE "" ) -- cgit v1.2.3 From d33ab2d3e0fde51e3d8833b16ff0a9f8b468472e Mon Sep 17 00:00:00 2001 From: Oz Linden Date: Mon, 10 Dec 2012 15:33:34 -0500 Subject: tag merge of DRTVWR-260 --- .hgtags | 1 + 1 file changed, 1 insertion(+) diff --git a/.hgtags b/.hgtags index 9e61f184f3..7f1a769c55 100755 --- a/.hgtags +++ b/.hgtags @@ -369,3 +369,4 @@ f4481df42f9a4a92bf475a80f0c51d1a4bbdfd59 DRTVWR-246 7c7d57d393e8ae7b61623279de06eb4a62ccae6a DRTVWR-249 f72b50ef168c159d6e79e97aa2bcafaf8577ab99 DRTVWR-230 b418be80903520c492e1173f3afbc4021cad5d07 DRTVWR-255 +9aa1aa9f1fe13c194695a0b8f0af298296241dc2 DRTVWR-260 -- cgit v1.2.3