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/qmltest | |
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/qmltest')
-rw-r--r-- | examples/qmltest/qmltest/.prev_CMakeLists.txt | 6 | ||||
-rw-r--r-- | examples/qmltest/qmltest/CMakeLists.txt | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/examples/qmltest/qmltest/.prev_CMakeLists.txt b/examples/qmltest/qmltest/.prev_CMakeLists.txt index b3d5cc69ae..08f9e8b1c9 100644 --- a/examples/qmltest/qmltest/.prev_CMakeLists.txt +++ b/examples/qmltest/qmltest/.prev_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) diff --git a/examples/qmltest/qmltest/CMakeLists.txt b/examples/qmltest/qmltest/CMakeLists.txt index 8a890cc246..f8c290f278 100644 --- a/examples/qmltest/qmltest/CMakeLists.txt +++ b/examples/qmltest/qmltest/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) |