diff options
| author | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2012-08-17 01:41:07 +0000 |
| commit | 7ac0d2b8a31174b3d8872ec8ed5ed64c3d0bc7ed (patch) | |
| tree | 71ee0b4b8ed4f0f1a90f3138604b9d074087c4ad /indra/cmake/LLAddBuildTest.cmake | |
| parent | 48b7eff75835058f144bbc27a5b2ef2997be2be4 (diff) | |
| parent | 7204593ec3f6fca63c32bcb8cdcf9c356165d24e (diff) | |
Merge viewer-development -> sunshine
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 a6f69a09e9..543075db5b 100644..100755 --- a/indra/cmake/LLAddBuildTest.cmake +++ b/indra/cmake/LLAddBuildTest.cmake @@ -201,6 +201,15 @@ 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) |