From 472e6921994d24e0c2134ae05d9c9044ed57b76d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 13 Oct 2020 09:48:34 +0200 Subject: CMake: Honor INSTALL_EXAMPLESDIR Re-generate examples, but only the chunks that handle INSTALL_EXAMPLESDIR, because there have been so many manual changes that were not special-cased. Fixes: QTBUG-87331 Change-Id: I0926c015ce2733b462adba18e3dbf47621a7e679 Reviewed-by: Alexandru Croitor Reviewed-by: Christophe Giboudeaux --- examples/qt3d/basicshapes-cpp/CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'examples/qt3d/basicshapes-cpp') diff --git a/examples/qt3d/basicshapes-cpp/CMakeLists.txt b/examples/qt3d/basicshapes-cpp/CMakeLists.txt index cebb87ae7..fd97f8604 100644 --- a/examples/qt3d/basicshapes-cpp/CMakeLists.txt +++ b/examples/qt3d/basicshapes-cpp/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) -- cgit v1.2.3