diff options
| author | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
|---|---|---|
| committer | simon <simon@lindenlab.com> | 2024-01-03 01:34:58 +0000 |
| commit | 520f710cd6b5826403383f8c3488a94c64ac8081 (patch) | |
| tree | 3936a248d991e11b82768ff10a5079789299bb53 /indra/cmake/Copy3rdPartyLibs.cmake | |
| parent | d4c3300f9b81296f765c83c1e822251e86d91925 (diff) | |
| parent | a592292242e29d0379ee72572a434359e1e892d1 (diff) | |
Merge remote-tracking branch 'origin/main' into simon/sl-20635-new-data
Diffstat (limited to 'indra/cmake/Copy3rdPartyLibs.cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake index a3db02372d..7938d4f54b 100644 --- a/indra/cmake/Copy3rdPartyLibs.cmake +++ b/indra/cmake/Copy3rdPartyLibs.cmake @@ -86,7 +86,8 @@ if(WINDOWS) endif (USE_BUGSPLAT) if (TARGET ll::fmodstudio) - set(debug_files ${debug_files} fmodL.dll) + # fmodL is included for logging, only one should be picked by manifest + set(release_files ${release_files} fmodL.dll) set(release_files ${release_files} fmod.dll) endif () |