diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-28 16:37:02 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-29 10:01:22 +0200 |
commit | 965984771d1c146a01fbaab3f6dae2461eabf78e (patch) | |
tree | 44022f6e8affb27a477e58fd29eebac6769c42f4 /examples/quick/quickwidgets | |
parent | 476d1f57605a1d9867a87946d1cdf7bb3c1ced3a (diff) |
CMake: Regenerate qtdeclarative/examples
Includes
- new example installation paths
- one case of QT_QMLTYPES_FILENAME addition
Change-Id: I24423da9b04b6ecc8445017fa35f148dd43b1829
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'examples/quick/quickwidgets')
-rw-r--r-- | examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/quick/quickwidgets/quickwidget/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt b/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt index f9d83f55b9..74f06a856b 100644 --- a/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt +++ b/examples/quick/quickwidgets/qquickviewcomparison/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/quick/quickwidgets/qquickviewcomparison") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickwidgets/qquickviewcomparison") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt index 1396b830b4..1c6d05dde3 100644 --- a/examples/quick/quickwidgets/quickwidget/CMakeLists.txt +++ b/examples/quick/quickwidgets/quickwidget/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/quick/quickwidgets/quickwidget") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/quickwidgets/quickwidget") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) |