diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-22 18:08:49 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-22 18:08:49 -0400 |
| commit | 1057caffaf24790be26376b2794059e7635dde7b (patch) | |
| tree | 6f207f916bcf9430ffd0e863600dca642ec799c7 /indra/cmake/LLAddBuildTest.cmake | |
| parent | 7632861fc40ffd05b6a1704f629a38250600c294 (diff) | |
| parent | e15b7bafbb7168a721ffd286c1d1f4e6299abb44 (diff) | |
merge changes for latest snowstorm project viewer
Diffstat (limited to 'indra/cmake/LLAddBuildTest.cmake')
| -rwxr-xr-x | indra/cmake/LLAddBuildTest.cmake | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 543075db5b..9bb3077797 100755 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -201,23 +201,17 @@ 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 - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_RELEASE "" ) |