diff options
| author | James Cook <james@lindenlab.com> | 2009-12-02 17:16:27 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-02 17:16:27 -0800 |
| commit | 9897e53de5adcdedbe086df38b740bf4c2d8abe7 (patch) | |
| tree | cea7a9e5f3ddbeebbcf07339929208d61debe21c | |
| parent | 11ffb356cf7a4da9cfa8b7df6ef980b8743f36f0 (diff) | |
| parent | 7bb1050564b5e904be5d180e714189dd3a98db14 (diff) | |
merge
| -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) |