diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-09-12 18:44:30 -0400 |
| commit | 3f71d3b41c938fd5d433da6ca1b404586c49c401 (patch) | |
| tree | 0ec16a8f4a8fed65834a0776097f074073cf0fa4 /indra/cmake/LLAddBuildTest.cmake | |
| parent | a11cc73736b6824e4dc6d0a693bcfb26514b16eb (diff) | |
| parent | 3a36e3c6a82462b8d01e47707391be168e739b66 (diff) | |
re-merge changes to disable tcmalloc
Diffstat (limited to 'indra/cmake/LLAddBuildTest.cmake')
| -rwxr-xr-x | indra/cmake/LLAddBuildTest.cmake | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/indra/cmake/LLAddBuildTest.cmake b/indra/cmake/LLAddBuildTest.cmake index 03ce46781c..543075db5b 100755 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -214,6 +214,15 @@ FUNCTION(LL_ADD_INTEGRATION_TEST SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} PROPERTIES COMPILE_FLAGS -I"${TUT_INCLUDE_DIR}") endif(STANDALONE) + if (WINDOWS) + SET_TARGET_PROPERTIES(INTEGRATION_TEST_${testname} + PROPERTIES + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" + LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" + LINK_FLAGS_RELEASE "" + ) + endif (WINDOWS) + # Add link deps to the executable if(TEST_DEBUG) message(STATUS "TARGET_LINK_LIBRARIES(INTEGRATION_TEST_${testname} ${libraries})") |