diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-12-05 11:51:58 +0100 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-12-05 15:55:53 +0100 |
commit | 0c5f1beddcacd7e18b8f71eb08ef55b1f4234d8a (patch) | |
tree | 1230380680c77cff4a6323de713d982bab386cdc | |
parent | c682d78ac27c144c7309954d3d864932a5642237 (diff) |
CMake: Clean up usage of the examples/widgets/painting/shared lib
Remove conversion artifacts.
Also, remove setting the include path. The library's interface takes
care of that.
Change-Id: Ib5043f15ede2171ab876ccbe603ed0b84de1bce4
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | examples/widgets/painting/affine/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/widgets/painting/composition/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/widgets/painting/deform/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/widgets/painting/gradients/CMakeLists.txt | 19 | ||||
-rw-r--r-- | examples/widgets/painting/pathstroke/CMakeLists.txt | 19 |
5 files changed, 0 insertions, 95 deletions
diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt index 93cbcc416f..1fbf9e4e0c 100644 --- a/examples/widgets/painting/affine/CMakeLists.txt +++ b/examples/widgets/painting/affine/CMakeLists.txt @@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() qt_add_executable(affine - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h main.cpp xform.cpp xform.h ) @@ -28,10 +24,6 @@ set_target_properties(affine PROPERTIES MACOSX_BUNDLE TRUE ) -target_include_directories(affine PRIVATE - ../shared -) - if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() @@ -104,17 +96,6 @@ qt_add_resources(affine "affine" ${affine_resource_files} ) -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PRIVATE - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PRIVATE - #Qt6::OpenGL - #) -#endif() - install(TARGETS affine RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt index 33fa616317..a27d59670a 100644 --- a/examples/widgets/painting/composition/CMakeLists.txt +++ b/examples/widgets/painting/composition/CMakeLists.txt @@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() qt_add_executable(composition - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h composition.cpp composition.h main.cpp ) @@ -28,10 +24,6 @@ set_target_properties(composition PROPERTIES MACOSX_BUNDLE TRUE ) -target_include_directories(composition PRIVATE - ../shared -) - if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() @@ -105,17 +97,6 @@ qt_add_resources(composition "composition" ${composition_resource_files} ) -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PRIVATE - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PRIVATE - #Qt6::OpenGL - #) -#endif() - install(TARGETS composition RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt index 529dd1ec3a..779d814172 100644 --- a/examples/widgets/painting/deform/CMakeLists.txt +++ b/examples/widgets/painting/deform/CMakeLists.txt @@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() qt_add_executable(deform - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h main.cpp pathdeform.cpp pathdeform.h ) @@ -28,10 +24,6 @@ set_target_properties(deform PROPERTIES MACOSX_BUNDLE TRUE ) -target_include_directories(deform PRIVATE - ../shared -) - if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() @@ -103,17 +95,6 @@ qt_add_resources(deform "deform" ${deform_resource_files} ) -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PRIVATE - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PRIVATE - #Qt6::OpenGL - #) -#endif() - install(TARGETS deform RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt index 967e5e2e94..ed8f0082cb 100644 --- a/examples/widgets/painting/gradients/CMakeLists.txt +++ b/examples/widgets/painting/gradients/CMakeLists.txt @@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() qt_add_executable(gradients - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h gradients.cpp gradients.h main.cpp ) @@ -28,10 +24,6 @@ set_target_properties(gradients PROPERTIES MACOSX_BUNDLE TRUE ) -target_include_directories(gradients PRIVATE - ../shared -) - if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() @@ -103,17 +95,6 @@ qt_add_resources(gradients "gradients" ${gradients_resource_files} ) -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PRIVATE - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PRIVATE - #Qt6::OpenGL - #) -#endif() - install(TARGETS gradients RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt index de07332b5f..88208d0489 100644 --- a/examples/widgets/painting/pathstroke/CMakeLists.txt +++ b/examples/widgets/painting/pathstroke/CMakeLists.txt @@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) qt_standard_project_setup() qt_add_executable(pathstroke - # remove files from ../shared - #../shared/arthurstyle.cpp ../shared/arthurstyle.h - #../shared/arthurwidgets.cpp ../shared/arthurwidgets.h - #../shared/hoverpoints.cpp ../shared/hoverpoints.h main.cpp pathstroke.cpp pathstroke.h ) @@ -28,10 +24,6 @@ set_target_properties(pathstroke PROPERTIES MACOSX_BUNDLE TRUE ) -target_include_directories(pathstroke PRIVATE - ../shared -) - if(NOT TARGET painting_shared::painting_shared) include(../shared/use_lib.cmake) endif() @@ -103,17 +95,6 @@ qt_add_resources(pathstroke "pathstroke" ${pathstroke_resource_files} ) -# remove files from ../shared -#if(QT_FEATURE_opengl) - #target_sources(affine PRIVATE - #../shared/fbopaintdevice.cpp ../shared/fbopaintdevice.h - #) - - #target_link_libraries(affine PRIVATE - #Qt6::OpenGL - #) -#endif() - install(TARGETS pathstroke RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" |