From 76108058796bf0884f6fd128d81f1bc49f9a56af Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 4 Feb 2020 08:15:50 +0100 Subject: Regenerate examples Change-Id: I04b2adbe370ffea81d7787ad90e4ae69d2c165cb Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann --- .../tools/plugandpaint/app/.prev_CMakeLists.txt | 66 ++++++++++++++++++++++ .../widgets/tools/plugandpaint/app/CMakeLists.txt | 36 +++++++++++- .../plugins/basictools/.prev_CMakeLists.txt | 35 ++++++++++++ .../plugandpaint/plugins/basictools/CMakeLists.txt | 38 ++++++++++--- .../plugins/extrafilters/.prev_CMakeLists.txt | 35 ++++++++++++ .../plugins/extrafilters/CMakeLists.txt | 36 ++++++++++-- 6 files changed, 232 insertions(+), 14 deletions(-) create mode 100644 examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt create mode 100644 examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt create mode 100644 examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt (limited to 'examples/widgets/tools/plugandpaint') diff --git a/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt new file mode 100644 index 0000000000..0a7a7155ad --- /dev/null +++ b/examples/widgets/tools/plugandpaint/app/.prev_CMakeLists.txt @@ -0,0 +1,66 @@ +# 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) + +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_qt_gui_executable(plugandpaint + interfaces.h + main.cpp + mainwindow.cpp mainwindow.h + paintarea.cpp paintarea.h + plugindialog.cpp plugindialog.h +) +target_link_libraries(plugandpaint PUBLIC + # Remove: L../plugins + Qt::Core + Qt::Gui + Qt::Widgets +) + +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}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt index 8d7f931996..5548074446 100644 --- a/examples/widgets/tools/plugandpaint/app/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/app/CMakeLists.txt @@ -9,8 +9,10 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) -set(INSTALL_EXAMPLEDIR "examples") +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint") +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) find_package(Qt6 COMPONENTS Widgets) add_qt_gui_executable(plugandpaint @@ -22,11 +24,43 @@ add_qt_gui_executable(plugandpaint ) target_link_libraries(plugandpaint PUBLIC # Remove: L../plugins + Qt::Core + Qt::Gui Qt::Widgets pnp_basictools # special case ) 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}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt new file mode 100644 index 0000000000..fefa30e2a4 --- /dev/null +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# 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) + +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_library(pnp_basictools MODULE + basictoolsplugin.cpp basictoolsplugin.h +) +target_include_directories(pnp_basictools PUBLIC + ../../app +) + +target_link_libraries(pnp_basictools PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets +) + +install(TARGETS pnp_basictools + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt index 64d239b054..fefa30e2a4 100644 --- a/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/basictools/CMakeLists.txt @@ -1,13 +1,35 @@ -# special case begin +# Generated from basictools.pro. -add_library(pnp_basictools MODULE STATIC +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) + +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_library(pnp_basictools MODULE basictoolsplugin.cpp basictoolsplugin.h ) -set_target_properties(pnp_basictools PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "../../plugins" - RUNTIME_OUTPUT_DIRECTORY "../../plugins" +target_include_directories(pnp_basictools PUBLIC + ../../app +) + +target_link_libraries(pnp_basictools PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets ) -target_include_directories(pnp_basictools PUBLIC ../../app) -target_link_libraries(pnp_basictools PUBLIC Qt::Widgets) -# special case end +install(TARGETS pnp_basictools + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt new file mode 100644 index 0000000000..2f689893bb --- /dev/null +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/.prev_CMakeLists.txt @@ -0,0 +1,35 @@ +# Generated from extrafilters.pro. + +cmake_minimum_required(VERSION 3.14) +project(pnp_extrafilters LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_library(pnp_extrafilters MODULE + extrafiltersplugin.cpp extrafiltersplugin.h +) +target_include_directories(pnp_extrafilters PUBLIC + ../../app +) + +target_link_libraries(pnp_extrafilters PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets +) + +install(TARGETS pnp_extrafilters + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) diff --git a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt index 31d6f5ef65..2f689893bb 100644 --- a/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt +++ b/examples/widgets/tools/plugandpaint/plugins/extrafilters/CMakeLists.txt @@ -1,9 +1,35 @@ -# special case begin +# Generated from extrafilters.pro. -add_library(pnp_extrafilters_plugin MODULE +cmake_minimum_required(VERSION 3.14) +project(pnp_extrafilters LANGUAGES CXX) + +set(CMAKE_INCLUDE_CURRENT_DIR ON) + +set(CMAKE_AUTOMOC ON) +set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) + +set(INSTALL_EXAMPLEDIR "examples/widgets/tools/plugandpaint/plugins") + +find_package(Qt6 COMPONENTS Core) +find_package(Qt6 COMPONENTS Gui) +find_package(Qt6 COMPONENTS Widgets) + +add_library(pnp_extrafilters MODULE extrafiltersplugin.cpp extrafiltersplugin.h ) -target_include_directories(pnp_extrafilters_plugin PRIVATE ../../app) -target_link_libraries(pnp_extrafilters_plugin PRIVATE Qt::Widgets) +target_include_directories(pnp_extrafilters PUBLIC + ../../app +) + +target_link_libraries(pnp_extrafilters PUBLIC + Qt::Core + Qt::Gui + Qt::Widgets +) -# special case end +install(TARGETS pnp_extrafilters + RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" +) -- cgit v1.2.3