diff options
| author | Logan Dethrow <log@lindenlab.com> | 2012-12-11 17:14:24 -0500 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2012-12-11 17:14:24 -0500 |
| commit | 2807c0b9424f9d3f80e49a3c150af0a459676d79 (patch) | |
| tree | 2fdf21ef5429e112cc767bf3f594c8fe5c3d950b /indra/cmake | |
| parent | 5798dd54ccbf2728725eae397a235c89d111cf93 (diff) | |
| parent | 03025733484f7f1ea46d0356e65b0d142bc1dbdb (diff) | |
Automated merge with ssh://bitbucket.org/lindenlab/sunshine-internal
Diffstat (limited to 'indra/cmake')
| -rwxr-xr-x | 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 100755 --- 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 |