From 476b9eb3d12913345bcf629a25f6d91a8bdc2792 Mon Sep 17 00:00:00 2001 From: James Turner Date: Sun, 23 Aug 2020 21:10:56 +0100 Subject: [PATCH] Ensure OSG headers are founding building the UI --- src/GUI/CMakeLists.txt | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/GUI/CMakeLists.txt b/src/GUI/CMakeLists.txt index 55935646f..87bb61816 100644 --- a/src/GUI/CMakeLists.txt +++ b/src/GUI/CMakeLists.txt @@ -135,7 +135,11 @@ if (HAVE_QT) ${qml_sources}) set_property(TARGET fglauncher PROPERTY AUTOMOC ON) - target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) + target_include_directories(fglauncher PRIVATE ${PROJECT_BINARY_DIR}/src/GUI ) + + # we include WindowBuilder.h which needs this + target_include_directories(fglauncher PRIVATE ${OPENSCENEGRAPH_INCLUDE_DIRS}) + target_link_libraries(fglauncher Qt5::Core Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Quick Qt5::Svg SimGearCore) if (ENABLE_QQ_UI) @@ -196,8 +200,8 @@ if (HAVE_QT) set_property(TARGET fgqmlui PROPERTY AUTOMOC ON) target_link_libraries(fgqmlui Qt5::Quick Qt5::Widgets Qt5::Network Qt5::Qml Qt5::Gui SimGearCore) - target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI) - + target_include_directories(fgqmlui PRIVATE ${PROJECT_BINARY_DIR}/src/GUI ${OPENSCENEGRAPH_INCLUDE_DIRS}) + if (ENABLE_QQ_UI) # this is a headers-only dependency, so we can include target_link_libraries(fgqmlui Qt5::GuiPrivate)