fly/flightgear
1
0
Fork 0
Code Activity

Workaround Fedora Qt packaging bug

Browse source 
Use a manual include file, instead of the official method, to check
if the Qt5 private headers are installed or not.
This commit is contained in:
James Turner 2020-06-24 16:36:45 +01:00
parent ee6f4388ee
commit 94f98294de
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -5,6 +5,7 @@ include (CheckVariableExists)
include (CheckCSourceCompiles) include (CheckCSourceCompiles)
include (CheckCXXSourceCompiles) include (CheckCXXSourceCompiles)
include (CheckIncludeFile) include (CheckIncludeFile)
include (CheckIncludeFileCXX)
cmake_policy(SET CMP0054 NEW) cmake_policy(SET CMP0054 NEW)
cmake_policy(SET CMP0042 NEW) # Mac RPATH policy cmake_policy(SET CMP0042 NEW) # Mac RPATH policy
@ -379,7 +380,13 @@ if (ENABLE_QT)
set(ENABLE_FGQCANVAS OFF) set(ENABLE_FGQCANVAS OFF)
endif() endif()
if (TARGET Qt5::GuiPrivate) # we would ideally use TARGET::Qt5GuiPrivate but Fedora broke it
# perform a manual check instead
# see https://bugzilla.redhat.com/show_bug.cgi?id=1846613
set (CMAKE_REQUIRED_INCLUDES ${Qt5Gui_PRIVATE_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS})
check_include_file_cxx("private/qopenglcontext_p.h" REALLY_HAVE_QGUIPRIVATE)
if (REALLY_HAVE_QGUIPRIVATE)
message(STATUS "Have QtGUI private headers") message(STATUS "Have QtGUI private headers")
set(ENABLE_QQ_UI 1) set(ENABLE_QQ_UI 1)
else() else()