diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:33:39 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-12-10 15:33:39 -0500 |
| commit | edcdce226a7ff599e43c89fe7e4d37350650ae96 (patch) | |
| tree | 0a816aa442092e442572d38f4c95b12fef500559 /indra/llcorehttp | |
| parent | a0d3781666934d0ac977ccc6cb0480326dc99f37 (diff) | |
| parent | d33ab2d3e0fde51e3d8833b16ff0a9f8b468472e (diff) | |
merge changes for DRTVWR-260
Diffstat (limited to 'indra/llcorehttp')
| -rw-r--r-- | indra/llcorehttp/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llcorehttp/CMakeLists.txt b/indra/llcorehttp/CMakeLists.txt index 82fb3f0d4e..9adfd0ed62 100644 --- a/indra/llcorehttp/CMakeLists.txt +++ b/indra/llcorehttp/CMakeLists.txt @@ -174,7 +174,7 @@ if (LL_TESTS) # The following come from LLAddBuildTest.cmake's INTEGRATION_TEST_xxxx target. set_target_properties(http_texture_load PROPERTIES - LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS /INCLUDE:__tcmalloc" + LINK_FLAGS "/debug /NODEFAULTLIB:LIBCMT /SUBSYSTEM:WINDOWS ${TCMALLOC_LINK_FLAGS}" LINK_FLAGS_DEBUG "/NODEFAULTLIB:\"LIBCMT;LIBCMTD;MSVCRT\" /INCREMENTAL:NO" LINK_FLAGS_RELEASE "" ) |