diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-27 08:55:29 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2021-04-27 21:33:48 +0200 |
| commit | 4caac1feea025b0ad496141e8f16ab88c04c2caa (patch) | |
| tree | ca1e0b60217e33ea2f7a9bbd0edb6a54aa8729d3 /examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt | |
| parent | a239045d59ba0c04a28c3ac16fbf9e9dfaa8f13c (diff) | |
Re-work the CMake project files for the plugandpaint example
Move the project prelude to
examples/widgets/tools/plugandpaint/CMakeLists.txt
to mark it as the entry point of the example project.
Remove the project prelude from all its subdirectories, because the
subdirs are not supposed to be built separately.
Remove the wrong code that pro2cmake generated for the application's
project file. That merely tried to link the basictools static plugin.
Move common initialization code (CMAKE_AUTO*, INSTALL_EXAMPLESDIR) to
the top-level plugandpaint project file.
Remove superfluous CMAKE_INCLUDE_CURRENT_DIR.
Set the output directory of the extrafilters plugin to the application's
build directory such that the app can find the plugin without having to
install the example.
Skip regeneration in those files, to avoid scattering the project files
with special case markers.
Fixes: QTBUG-87449
Fixes: QTBUG-91066
Change-Id: I3ceb08f5fcda1ffea3c35cee8580f7b5e4ecfc1f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt')
| -rw-r--r-- | examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index 97e4021d61..c66f83ce62 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -1,23 +1,5 @@ # Generated from basictools.pro. - -cmake_minimum_required(VERSION 3.14) -project(pnp_basictools 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}/widgets/tools/plugandpaint/plugins") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +# special case skip regeneration qt_add_plugin(pnp_basictools STATIC) target_sources(pnp_basictools PRIVATE @@ -36,9 +18,3 @@ target_link_libraries(pnp_basictools PUBLIC Qt::Gui Qt::Widgets ) - -install(TARGETS pnp_basictools - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" -) |