mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-08 09:37:53 +00:00
Merge branch 'fix-macos-libraries' into 'master'
Use CMAKE_FIND_FRAMEWORK ONLY for OpenGL on MacOS Closes #7934 See merge request OpenMW/openmw!4368
This commit is contained in:
commit
6b762a5328
@ -235,7 +235,16 @@ if(MSVC)
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Dependencies
|
# Dependencies
|
||||||
find_package(OpenGL REQUIRED)
|
if (APPLE)
|
||||||
|
# Force CMake to use the installed version of OpenGL on macOS
|
||||||
|
set(_SAVE_CMAKE_FIND_FRAMEWORK ${CMAKE_FIND_FRAMEWORK})
|
||||||
|
set(CMAKE_FIND_FRAMEWORK ONLY)
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
set(CMAKE_FIND_FRAMEWORK ${_SAVE_CMAKE_FIND_FRAMEWORK})
|
||||||
|
unset(_SAVE_CMAKE_FIND_FRAMEWORK)
|
||||||
|
else()
|
||||||
|
find_package(OpenGL REQUIRED)
|
||||||
|
endif()
|
||||||
|
|
||||||
find_package(LZ4 REQUIRED)
|
find_package(LZ4 REQUIRED)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user