diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-06 13:01:17 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2012-01-06 13:01:17 -0500 |
| commit | bfe6e94f5388b887253ba77f633ae332affe9f92 (patch) | |
| tree | 06169f9e4e8cb30b52b779e9a67d1bd2633577b1 /indra/cmake/LLAddBuildTest.cmake | |
| parent | d3b0a1375509f772ec3ddbc790b5a5d9f4fa7594 (diff) | |
SH-2789 WIP - fixing the LL_USE_TCMALLOC code, make tests build with the same tcmalloc options as the sl executable
Diffstat (limited to 'indra/cmake/LLAddBuildTest.cmake')
| -rwxr-xr-x[-rw-r--r--] | 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 08feab6e36..a6f69a09e9 100644..100755 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -205,6 +205,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})") |