diff options
author | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-01-04 10:23:22 -0500 |
commit | b75fc0af897124a05ab3842bdfc60f428d22e051 (patch) | |
tree | 3cce57b84110720ea15f370b496d1bc6340a154f /indra/cmake | |
parent | 584b615c3444fdeaa0d41f1d9e839edf1518a310 (diff) | |
parent | def472b45cb17dd125f802dc3be85450135537a8 (diff) |
merge up to 3.4.4 beta
Diffstat (limited to 'indra/cmake')
-rw-r--r-- | indra/cmake/LLAddBuildTest.cmake | 10 |
1 files changed, 2 insertions, 8 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 |