AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Clean up usage of the examples/widgets/painting/shared lib

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2022-12-05 11:51:58 +01:00
parent c682d78ac2
commit 0c5f1beddc
5 changed files with 0 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
examples/widgets/painting/affine/CMakeLists.txt
View File

@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(affine 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 main.cpp
xform.cpp xform.h xform.cpp xform.h
) )
@ -28,10 +24,6 @@ set_target_properties(affine PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
) )
target_include_directories(affine PRIVATE
../shared
)
if(NOT TARGET painting_shared::painting_shared) if(NOT TARGET painting_shared::painting_shared)
include(../shared/use_lib.cmake) include(../shared/use_lib.cmake)
endif() endif()
@ -104,17 +96,6 @@ qt_add_resources(affine "affine"
${affine_resource_files} ${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 install(TARGETS affine
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

19
examples/widgets/painting/composition/CMakeLists.txt
View File

@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(composition 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 composition.cpp composition.h
main.cpp main.cpp
) )
@ -28,10 +24,6 @@ set_target_properties(composition PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
) )
target_include_directories(composition PRIVATE
../shared
)
if(NOT TARGET painting_shared::painting_shared) if(NOT TARGET painting_shared::painting_shared)
include(../shared/use_lib.cmake) include(../shared/use_lib.cmake)
endif() endif()
@ -105,17 +97,6 @@ qt_add_resources(composition "composition"
${composition_resource_files} ${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 install(TARGETS composition
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

19
examples/widgets/painting/deform/CMakeLists.txt
View File

@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(deform 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 main.cpp
pathdeform.cpp pathdeform.h pathdeform.cpp pathdeform.h
) )
@ -28,10 +24,6 @@ set_target_properties(deform PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
) )
target_include_directories(deform PRIVATE
../shared
)
if(NOT TARGET painting_shared::painting_shared) if(NOT TARGET painting_shared::painting_shared)
include(../shared/use_lib.cmake) include(../shared/use_lib.cmake)
endif() endif()
@ -103,17 +95,6 @@ qt_add_resources(deform "deform"
${deform_resource_files} ${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 install(TARGETS deform
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

19
examples/widgets/painting/gradients/CMakeLists.txt
View File

@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(gradients 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 gradients.cpp gradients.h
main.cpp main.cpp
) )
@ -28,10 +24,6 @@ set_target_properties(gradients PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
) )
target_include_directories(gradients PRIVATE
../shared
)
if(NOT TARGET painting_shared::painting_shared) if(NOT TARGET painting_shared::painting_shared)
include(../shared/use_lib.cmake) include(../shared/use_lib.cmake)
endif() endif()
@ -103,17 +95,6 @@ qt_add_resources(gradients "gradients"
${gradients_resource_files} ${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 install(TARGETS gradients
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"

19
examples/widgets/painting/pathstroke/CMakeLists.txt
View File

@ -15,10 +15,6 @@ find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets)
qt_standard_project_setup() qt_standard_project_setup()
qt_add_executable(pathstroke 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 main.cpp
pathstroke.cpp pathstroke.h pathstroke.cpp pathstroke.h
) )
@ -28,10 +24,6 @@ set_target_properties(pathstroke PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
) )
target_include_directories(pathstroke PRIVATE
../shared
)
if(NOT TARGET painting_shared::painting_shared) if(NOT TARGET painting_shared::painting_shared)
include(../shared/use_lib.cmake) include(../shared/use_lib.cmake)
endif() endif()
@ -103,17 +95,6 @@ qt_add_resources(pathstroke "pathstroke"
${pathstroke_resource_files} ${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 install(TARGETS pathstroke
RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}"
BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}"