mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-22 13:09:41 +00:00
Code Issues Releases Wiki Activity

Merge branch 'bullet-msvc-runtime' into 'master'

Browse source 
Fix FetchContent Bullet with MSVC

See merge request OpenMW/openmw!717
This commit is contained in:
psi29a 2021-04-08 10:07:01 +00:00
commit b68305e3e2
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
extern/CMakeLists.txt vendored
View file

@ -35,9 +35,13 @@ if(NOT OPENMW_USE_SYSTEM_BULLET)
set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE) set(BUILD_SHARED_LIBS OFF CACHE BOOL "" FORCE)
else() else()
set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE) set(BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE)
if(MSVC) endif()
set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
endif() if(MSVC)
# this setting is badly named - having it off forces the static runtime library,
# but having it on does nothing, letting the defaults get used.
# OpenMW uses the defaults, and you can't mix and match.
set(USE_MSVC_RUNTIME_LIBRARY_DLL ON CACHE BOOL "" FORCE)
endif() endif()
# master on 12 Mar 2021 # master on 12 Mar 2021