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/rendercontrol | |
| 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/rendercontrol')
4 files changed, 17 insertions, 3 deletions
diff --git a/examples/quick/rendercontrol/.prev_CMakeLists.txt b/examples/quick/rendercontrol/.prev_CMakeLists.txt new file mode 100644 index 0000000000..db19a3fc79 --- /dev/null +++ b/examples/quick/rendercontrol/.prev_CMakeLists.txt @@ -0,0 +1,6 @@ +# Generated from rendercontrol.pro. + +add_subdirectory(rendercontrol_opengl) +if(WIN32) + add_subdirectory(rendercontrol_d3d11) +endif() diff --git a/examples/quick/rendercontrol/CMakeLists.txt b/examples/quick/rendercontrol/CMakeLists.txt index 53924b33ce..219f40deb5 100644 --- a/examples/quick/rendercontrol/CMakeLists.txt +++ b/examples/quick/rendercontrol/CMakeLists.txt @@ -2,5 +2,5 @@ add_subdirectory(rendercontrol_opengl) if(WIN32 AND NOT MINGW) - add_subdirectory(rendercontrol_d3d11) + # add_subdirectory(rendercontrol_d3d11) # special case to be ported endif() diff --git a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt index c2f7a1f806..099a90f28c 100644 --- a/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_d3d11/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/quick/rendercontrol/rendercontrol_d3d11") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_d3d11") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) diff --git a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt index 310f721f2e..b821579188 100644 --- a/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt +++ b/examples/quick/rendercontrol/rendercontrol_opengl/CMakeLists.txt @@ -9,7 +9,11 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples/quick/rendercontrol/rendercontrol_opengl") +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/quick/rendercontrol/rendercontrol_opengl") find_package(Qt6 COMPONENTS Core) find_package(Qt6 COMPONENTS Gui) |