From 74cb331af3cfe723ae16cd1b00c9dd9291b4e7e9 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 7 Jul 2020 15:24:45 +0200 Subject: CMake: Regenerate examples Change-Id: I1c51b10af4e2b26f54740f257164c56a0e2a03ce Reviewed-by: Joerg Bornemann Reviewed-by: Qt CI Bot --- examples/qpa/CMakeLists.txt | 3 +++ examples/qpa/qrasterwindow/CMakeLists.txt | 6 +++++- examples/qpa/windows/CMakeLists.txt | 6 +++++- 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'examples/qpa') diff --git a/examples/qpa/CMakeLists.txt b/examples/qpa/CMakeLists.txt index 0ae7f61e57..6768aa052d 100644 --- a/examples/qpa/CMakeLists.txt +++ b/examples/qpa/CMakeLists.txt @@ -1,4 +1,7 @@ # Generated from qpa.pro. +if(NOT TARGET Qt::Gui) + return() +endif() add_subdirectory(windows) add_subdirectory(qrasterwindow) diff --git a/examples/qpa/qrasterwindow/CMakeLists.txt b/examples/qpa/qrasterwindow/CMakeLists.txt index 8fd75f1079..4e3444d0b7 100644 --- a/examples/qpa/qrasterwindow/CMakeLists.txt +++ b/examples/qpa/qrasterwindow/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/qpa/qrasterwindow") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qpa/qrasterwindow") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/qpa/windows/CMakeLists.txt b/examples/qpa/windows/CMakeLists.txt index 4eeab0e3bc..93d3d519fd 100644 --- a/examples/qpa/windows/CMakeLists.txt +++ b/examples/qpa/windows/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/qpa/windows") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/qpa/windows") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) -- cgit v1.2.3