diff options
author | Robert Griebl <robert.griebl@qt.io> | 2021-05-03 16:42:46 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2021-06-18 13:06:27 +0200 |
commit | 26e09279f3cd12324657011c640972e297928f53 (patch) | |
tree | 17839d952b17fcc6338105a85604f543dc95547b /examples/applicationmanager/application-features/native | |
parent | 12b4ee7d85b1197cd4b6024e710430a747f76838 (diff) |
cmake: Nearly full cmake build
Had to rename a lot of things to conform with the standard Qt module
layout that the cmake system expects:
- all non-manual tests were moved to a sub-dir named auto/
- the benchmark was moved to tests/
- the 3rdparty folder was moved into src/
Other changes:
- libyaml was updated to 2.2.5 while fixing a weird build issue that
led to crashes on 64bit systems.
- fixed build issues with the new 8.1 MingW compiler.
- added support for QT_NO_OPENGL builds.
The remaining issues are:
- examples still don't build with qmake due to a potential bug in
module.pri generation.
- tests do run, but the test data is not generated yet dynamically.
- qml-only tests are not built and run yet.
- qml-only examples are not built yet.
Fixes: AUTOSUITE-1632
Change-Id: Ic5fe0148e738b05835c73bed78e624b55861b75e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'examples/applicationmanager/application-features/native')
-rw-r--r-- | examples/applicationmanager/application-features/native/CMakeLists.txt | 5 | ||||
-rw-r--r-- | examples/applicationmanager/application-features/native/widgets/CMakeLists.txt | 41 |
2 files changed, 46 insertions, 0 deletions
diff --git a/examples/applicationmanager/application-features/native/CMakeLists.txt b/examples/applicationmanager/application-features/native/CMakeLists.txt new file mode 100644 index 00000000..0d1c9b10 --- /dev/null +++ b/examples/applicationmanager/application-features/native/CMakeLists.txt @@ -0,0 +1,5 @@ +# Generated from native.pro. + +if(TARGET Qt::WaylandClient AND TARGET Qt::Widgets) + add_subdirectory(widgets) +endif() diff --git a/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt b/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt new file mode 100644 index 00000000..11f79f20 --- /dev/null +++ b/examples/applicationmanager/application-features/native/widgets/CMakeLists.txt @@ -0,0 +1,41 @@ +# Generated from widgets.pro. + +cmake_minimum_required(VERSION 3.14) +project(widgets LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +if(NOT DEFINED INSTALL_EXAMPLESDIR) + set(INSTALL_EXAMPLESDIR "examples") +endif() + +set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/applicationmanager/application-features/apps/widgets") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +qt_add_executable(widgets + main.cpp +) +set_target_properties(widgets PROPERTIES + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE +) +target_link_libraries(widgets PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets + appman_commonPrivate + appman_launcherPrivate +) + +install(TARGETS widgets + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) |