diff options
author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-12-02 16:00:22 -0800 |
---|---|---|
committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-12-02 16:00:22 -0800 |
commit | 36ec149bef65f735e7900b5054efcc60f4add8ca (patch) | |
tree | baff7dcf029d34a88c79526d4c4b76f69a6a6c86 | |
parent | a0c133f819b7b6043e39a39a02310cd1fad67859 (diff) |
Removed libtcmalloc_minimal.dll from the default build.
Reviewed by Palmer
-rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index 342accad7a..5a142f23c9 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -35,7 +35,6 @@ if(WINDOWS) set(debug_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/debug") set(debug_files openjpegd.dll - libtcmalloc_minimal-debug.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll @@ -46,12 +45,16 @@ if(WINDOWS) set(release_src_dir "${CMAKE_SOURCE_DIR}/../libraries/i686-win32/lib/release") set(release_files openjpeg.dll - libtcmalloc_minimal.dll libapr-1.dll libaprutil-1.dll libapriconv-1.dll ) + if(USE_GOOGLE_PERFTOOLS) + set(debug_files ${debug_files} libtcmalloc_minimal-debug.dll) + set(release_files ${release_files} libtcmalloc_minimal.dll) + endif(USE_GOOGLE_PERFTOOLS) + if (FMOD_SDK_DIR) set(fmod_files fmod.dll) endif (FMOD_SDK_DIR) |