From 4caac1feea025b0ad496141e8f16ab88c04c2caa Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Tue, 27 Apr 2021 08:55:29 +0200 Subject: 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 --- .../widgets/tools/plugandpaint/app/CMakeLists.txt | 56 +--------------------- 1 file changed, 2 insertions(+), 54 deletions(-) (limited to 'examples/widgets/tools/plugandpaint/app/CMakeLists.txt') diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index bdf934fa2c..14cdaeb822 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -1,23 +1,5 @@ # Generated from app.pro. - -cmake_minimum_required(VERSION 3.14) -project(plugandpaint 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") - -find_package(Qt6 COMPONENTS Core) -find_package(Qt6 COMPONENTS Gui) -find_package(Qt6 COMPONENTS Widgets) +# special case skip regeneration qt_add_executable(plugandpaint interfaces.h @@ -31,43 +13,9 @@ set_target_properties(plugandpaint PROPERTIES MACOSX_BUNDLE TRUE ) target_link_libraries(plugandpaint PUBLIC - # Remove: L../plugins - Qt::Core - Qt::Gui Qt::Widgets - pnp_basictools # special case + pnp_basictools ) -target_link_libraries(plugandpaint PUBLIC pnp_basictools) # special case - -if(macx-xcode) - target_link_libraries(plugandpaint PUBLIC - ( - ) - pnp_basictools$ - ) -endif() - -if(NOT macx-xcode) - target_link_libraries(plugandpaint PUBLIC - pnp_basictools - ) -endif() - -if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (APPLE)) - target_link_libraries(plugandpaint PUBLIC - (LIBS, 0) - (LIBS, 1) - _debug - ) -endif() - -if(((NOT (macx-xcode)) AND (( NOT debug_and_release OR build_pass ) AND CONFIG(debug,debug OR release))) AND (WIN32)) - target_link_libraries(plugandpaint PUBLIC - (LIBS, 0) - (LIBS, 1) - d - ) -endif() install(TARGETS plugandpaint RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" -- cgit v1.2.3