diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-27 12:07:51 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-10-27 19:26:45 +0100 |
| commit | 638ac41293da9c6ae5e4ccb9baa7819c772ba9dd (patch) | |
| tree | 0d0aa42f2fbbacc42b874d460c0e9a796a93c271 /examples/widgets/painting/shared | |
| parent | f65abc63441bf821c4e4619b842c74b6d5074cbd (diff) | |
CMake: Fix painting examples to build as standalone projects
The examples use an intermediate object library to avoid duplicate
file compilation. The examples worked when built as part of Qt
because the shared directory was always added, and Qt::OpenGL is
available implicitly.
Change each project to add_subdirectory(../shared) if the object
library is not available, thus making the examples build as standalone
projects.
Call find_package inside the shared project, to ensure the Qt packages
are found.
Create an alias called 'painting_shared::painting_shared' and link
against that to ensure that any failure is caught at configure time
rather than build time.
Adapt the pathstroke example to use the object library.
Comment out the code for the OpenGL scopes, because it's handled
by the object library.
Make sure the OpenGL dependency is public.
Make sure to run moc and compile the OpenGL specific files as well.
Task-number: QTBUG-87444
Change-Id: Ib0ecb68948581c5267ca04f19d8043fa44ff3d54
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'examples/widgets/painting/shared')
| -rw-r--r-- | examples/widgets/painting/shared/CMakeLists.txt | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt index 4c7049e01d..9d43e4a980 100644 --- a/examples/widgets/painting/shared/CMakeLists.txt +++ b/examples/widgets/painting/shared/CMakeLists.txt @@ -1,7 +1,16 @@ -# special case: Entire file! +# special case skip regeneration +# Port of shared.pri to be included by painting examples + +if(NOT TARGET Qt::Widgets) + find_package(Qt6 REQUIRED COMPONENTS Widgets) +endif() + +if(NOT TARGET Qt::OpenGL) + find_package(Qt6 OPTIONAL_COMPONENTS OpenGL) +endif() -# special case: add_library(painting_shared OBJECT) +add_library(painting_shared::painting_shared ALIAS painting_shared) qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/ target_sources(painting_shared PRIVATE arthurstyle.cpp arthurstyle.h @@ -17,8 +26,9 @@ target_include_directories(painting_shared PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") if (TARGET Qt::OpenGL OR QT_FEATURE_opengles2) target_compile_definitions(painting_shared PRIVATE QT_OPENGL_SUPPORT) - target_link_libraries(painting_shared PRIVATE + target_link_libraries(painting_shared PUBLIC Qt::OpenGL - Qt::Widgets ) + qt6_wrap_cpp(moc_files_gl fbopaintdevice.h) # no automoc for OBJECT libs + target_sources(painting_shared PRIVATE fbopaintdevice.cpp fbopaintdevice.h ${moc_files_gl}) endif() |