diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 608bbb19cc..fa148f213c 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -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() diff --git a/libraries/display-plugins/CMakeLists.txt b/libraries/display-plugins/CMakeLists.txt index bfe88f2eb8..67c06120ca 100644 --- a/libraries/display-plugins/CMakeLists.txt +++ b/libraries/display-plugins/CMakeLists.txt @@ -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") diff --git a/libraries/gl/CMakeLists.txt b/libraries/gl/CMakeLists.txt index 855452e8f0..f0eec1da9f 100644 --- a/libraries/gl/CMakeLists.txt +++ b/libraries/gl/CMakeLists.txt @@ -1,5 +1,7 @@ set(TARGET_NAME gl) setup_hifi_library(Gui Widgets) link_hifi_libraries(shared) + +set(OpenGL_GL_PREFERENCE "GLVND") target_opengl() diff --git a/libraries/gpu-gl-common/CMakeLists.txt b/libraries/gpu-gl-common/CMakeLists.txt index 70cf3536ed..6bd98a45d0 100644 --- a/libraries/gpu-gl-common/CMakeLists.txt +++ b/libraries/gpu-gl-common/CMakeLists.txt @@ -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() diff --git a/libraries/gpu-gl/CMakeLists.txt b/libraries/gpu-gl/CMakeLists.txt index 225c795754..a57d0b66d8 100644 --- a/libraries/gpu-gl/CMakeLists.txt +++ b/libraries/gpu-gl/CMakeLists.txt @@ -5,5 +5,7 @@ if (UNIX) target_link_libraries(${TARGET_NAME} pthread) endif(UNIX) GroupSources("src") + +set(OpenGL_GL_PREFERENCE "GLVND") target_opengl() diff --git a/libraries/qml/CMakeLists.txt b/libraries/qml/CMakeLists.txt index f8ed7acdb1..b59b65824d 100644 --- a/libraries/qml/CMakeLists.txt +++ b/libraries/qml/CMakeLists.txt @@ -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() diff --git a/libraries/ui/CMakeLists.txt b/libraries/ui/CMakeLists.txt index cbafc00f82..6dde4cc1a2 100644 --- a/libraries/ui/CMakeLists.txt +++ b/libraries/ui/CMakeLists.txt @@ -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() diff --git a/tools/gpu-frame-player/CMakeLists.txt b/tools/gpu-frame-player/CMakeLists.txt index 141917000f..6ea896edf2 100644 --- a/tools/gpu-frame-player/CMakeLists.txt +++ b/tools/gpu-frame-player/CMakeLists.txt @@ -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() \ No newline at end of file +endif()