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>
This commit is contained in:
parent
c682d78ac2
commit
0c5f1beddc
@ -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}"
|
||||
|
@ -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}"
|
||||
|
@ -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}"
|
||||
|
@ -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}"
|
||||
|
@ -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}"
|
||||
|
Loading…
Reference in New Issue
Block a user