Pass OpenGL_GL_PREFERENCE variable to other Qt repos
When building Linux packages, we pass OpenGL_GL_PREFERENCE=LEGACY when building qtbase. This is done to link against legacy OpenGL libs. When building non-qtbase repos, we also need to set this variable to the same value we have in qtbase. Pick-to: 6.1 Task-number: QTBUG-89754 Fixes: QTBUG-94040 Change-Id: I567b629d245025d2b1544b91cfc265a9c921725f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
parent
25888b068c
commit
20feedac95
@ -637,6 +637,14 @@ endif()
|
|||||||
")
|
")
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(DEFINED OpenGL_GL_PREFERENCE)
|
||||||
|
string(APPEND QT_EXTRA_BUILD_INTERNALS_VARS
|
||||||
|
"
|
||||||
|
# Use the OpenGL_GL_PREFERENCE value qtbase was built with. But do not FORCE it.
|
||||||
|
set(OpenGL_GL_PREFERENCE \"${OpenGL_GL_PREFERENCE}\" CACHE STRING \"\")
|
||||||
|
")
|
||||||
|
endif()
|
||||||
|
|
||||||
qt_compute_relative_path_from_cmake_config_dir_to_prefix()
|
qt_compute_relative_path_from_cmake_config_dir_to_prefix()
|
||||||
configure_file(
|
configure_file(
|
||||||
"${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake.in"
|
"${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsExtra.cmake.in"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user