From d8515731c66ff1379038eb18acdbb5380bc7816a Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 26 Jul 2022 16:00:52 +0200 Subject: CMake: Make sure qtbase examples are installed into the correct path The find_package calls need to happen after we set INSTALL_EXAMPLEDIR to ensure that INSTALL_EXAMPLEDIR is overridden if necessary. Task-number: QTBUG-102879 Change-Id: I3c2e6c5a68a8c6ff9b98b79dbd6c83445d8da052 Reviewed-by: Alexey Edelev (cherry picked from commit 818a15234c8fb80cd9adad54bd726cf69726fa79) Reviewed-by: Qt Cherry-pick Bot --- examples/widgets/tools/echoplugin/CMakeLists.txt | 4 ++-- examples/widgets/tools/plugandpaint/CMakeLists.txt | 4 ++-- examples/widgets/tools/styleplugin/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/tools/echoplugin/CMakeLists.txt b/examples/widgets/tools/echoplugin/CMakeLists.txt index 93b49b43d7..c0b50033e0 100644 --- a/examples/widgets/tools/echoplugin/CMakeLists.txt +++ b/examples/widgets/tools/echoplugin/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.16) project(plugandpaint LANGUAGES CXX) -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - set(CMAKE_AUTOMOC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) @@ -11,5 +9,7 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/echoplugin") +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + add_subdirectory(plugin) add_subdirectory(echowindow) diff --git a/examples/widgets/tools/plugandpaint/CMakeLists.txt b/examples/widgets/tools/plugandpaint/CMakeLists.txt index 54cb83fd89..9138a34757 100644 --- a/examples/widgets/tools/plugandpaint/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.16) project(plugandpaint LANGUAGES CXX) -find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) - set(CMAKE_AUTOMOC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) @@ -11,5 +9,7 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/plugandpaint") +find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) + add_subdirectory(plugins) add_subdirectory(app) diff --git a/examples/widgets/tools/styleplugin/CMakeLists.txt b/examples/widgets/tools/styleplugin/CMakeLists.txt index acd918786d..ab083d362e 100644 --- a/examples/widgets/tools/styleplugin/CMakeLists.txt +++ b/examples/widgets/tools/styleplugin/CMakeLists.txt @@ -1,8 +1,6 @@ cmake_minimum_required(VERSION 3.16) project(styleplugin LANGUAGES CXX) -find_package(Qt6 REQUIRED COMPONENTS Widgets) - set(CMAKE_AUTOMOC ON) if(NOT DEFINED INSTALL_EXAMPLESDIR) @@ -11,5 +9,7 @@ endif() set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/tools/styleplugin") +find_package(Qt6 REQUIRED COMPONENTS Widgets) + add_subdirectory(stylewindow) add_subdirectory(plugin) -- cgit v1.2.3