diff options
| author | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
|---|---|---|
| committer | RunitaiLinden <davep@lindenlab.com> | 2023-12-14 14:12:01 -0600 |
| commit | 3c858d7e2d6633df14df473a918d2fb848403972 (patch) | |
| tree | 62b36692a0c1df2f34a85bc7fd4111afb2737d81 /indra/cmake | |
| parent | 8b86e2ad1b1326cb3e98acd857dc93f4f1455b8c (diff) | |
| parent | 32de0cb67d824498d0fc9d489ce19731ebfddfdf (diff) | |
Merge branch 'DRTVWR-601' of github.com:secondlife/viewer into DRTVWR-601
Diffstat (limited to 'indra/cmake')
| -rw-r--r-- | indra/cmake/Copy3rdPartyLibs.cmake | 3 | ||||
| -rw-r--r-- | indra/cmake/Python.cmake | 4 |
2 files changed, 4 insertions, 3 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 () diff --git a/indra/cmake/Python.cmake b/indra/cmake/Python.cmake index f9259f6c2b..da5d2ef22c 100644 --- a/indra/cmake/Python.cmake +++ b/indra/cmake/Python.cmake @@ -13,7 +13,7 @@ elseif (WINDOWS) foreach(hive HKEY_CURRENT_USER HKEY_LOCAL_MACHINE) # prefer more recent Python versions to older ones, if multiple versions # are installed - foreach(pyver 3.11 3.10 3.9 3.8 3.7) + foreach(pyver 3.12 3.11 3.10 3.9 3.8 3.7) list(APPEND regpaths "[${hive}\\SOFTWARE\\Python\\PythonCore\\${pyver}\\InstallPath]") endforeach() endforeach() @@ -40,7 +40,7 @@ elseif (WINDOWS) ${regpaths} ${pymaybe} ) - include(FindPythonInterp) + find_package(Python3 COMPONENTS Interpreter) else() find_program(python python3) |