Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-07 10:02:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Set GL preference to GLVND

Browse source 
This should be a no-op, besides generating less build warnings,
since:

"CMake 3.11 and above prefer to choose GLVND libraries."

And 3.11 is a few years old at this point
This commit is contained in:
Dale Glass 2020-09-27 20:37:12 +02:00
parent ac6486052d
commit 1c44bc96d9
8 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/CMakeLists.txt
View file

@ -238,6 +238,8 @@ target_include_directories(${TARGET_NAME} PRIVATE "${CMAKE_BINARY_DIR}/libraries
target_openssl()
target_bullet()
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()
add_crashpad()
target_breakpad()

1
libraries/display-plugins/CMakeLists.txt
View file

@ -13,6 +13,7 @@ include_hifi_library_headers(ktx)
include_hifi_library_headers(render)
include_hifi_library_headers(procedural)
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()
GroupSources("src/display-plugins")

2
libraries/gl/CMakeLists.txt
View file

@ -1,5 +1,7 @@
set(TARGET_NAME gl)
setup_hifi_library(Gui Widgets)
link_hifi_libraries(shared)
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()

2
libraries/gpu-gl-common/CMakeLists.txt
View file

@ -2,5 +2,7 @@ set(TARGET_NAME gpu-gl-common)
setup_hifi_library(Concurrent)
link_hifi_libraries(shared gl gpu shaders)
GroupSources("src")
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()

2
libraries/gpu-gl/CMakeLists.txt
View file

@ -5,5 +5,7 @@ if (UNIX)
target_link_libraries(${TARGET_NAME} pthread)
endif(UNIX)
GroupSources("src")
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()

1
libraries/qml/CMakeLists.txt
View file

@ -3,4 +3,5 @@ setup_hifi_library(Multimedia Network Qml Quick WebChannel WebSockets ${PLATFORM
link_hifi_libraries(shared networking gl)
# Required for some low level GL interaction in the OffscreenQMLSurface
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()

1
libraries/ui/CMakeLists.txt
View file

@ -4,4 +4,5 @@ link_hifi_libraries(shared networking qml gl audio audio-client plugins pointers
include_hifi_library_headers(controllers)
# Required for some low level GL interaction in the OffscreenQMLSurface
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()

4
tools/gpu-frame-player/CMakeLists.txt
View file

@ -21,6 +21,8 @@ link_hifi_libraries(
)
target_compile_definitions(${TARGET_NAME} PRIVATE USE_GL)
set(OpenGL_GL_PREFERENCE "GLVND")
target_opengl()
#target_vulkan()
@ -38,4 +40,4 @@ install(
PATTERN "*.exp" EXCLUDE
)
endif()
endif()