Fix build of standalone painting examples

Since commit f5c69a5 the examples/widgets/painting examples could not be built standalone anymore. Move the find_package calls out of the examples/widgets/painting/shared subdirectory and add a .cmake file that can be included to use the library conveniently. Change-Id: I35cb5bd8419a67c782d109104c4a88d64477a8be Reviewed-by: Alexandru Croitor <[email protected]>
chain78 · May 17, 2021 · db25a06 · db25a06
1 parent 536a4ab
commit db25a06
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 13 deletions.
diff --git a/examples/widgets/painting/affine/CMakeLists.txt b/examples/widgets/painting/affine/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(affine PUBLIC
 
 # special case begin
 if(NOT TARGET painting_shared::painting_shared)
-  add_subdirectory(../shared painting_shared)
+    include(../shared/use_lib.cmake)
 endif()
 # special case end
 

diff --git a/examples/widgets/painting/composition/CMakeLists.txt b/examples/widgets/painting/composition/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(composition PUBLIC
 
 # special case begin
 if(NOT TARGET painting_shared::painting_shared)
-  add_subdirectory(../shared painting_shared)
+    include(../shared/use_lib.cmake)
 endif()
 # special case end
 

diff --git a/examples/widgets/painting/deform/CMakeLists.txt b/examples/widgets/painting/deform/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(deform PUBLIC
 
 # special case begin
 if(NOT TARGET painting_shared::painting_shared)
-  add_subdirectory(../shared painting_shared)
+    include(../shared/use_lib.cmake)
 endif()
 # special case end
 

diff --git a/examples/widgets/painting/gradients/CMakeLists.txt b/examples/widgets/painting/gradients/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(gradients PUBLIC
 
 # special case begin
 if(NOT TARGET painting_shared::painting_shared)
-  add_subdirectory(../shared painting_shared)
+    include(../shared/use_lib.cmake)
 endif()
 # special case end
 

diff --git a/examples/widgets/painting/pathstroke/CMakeLists.txt b/examples/widgets/painting/pathstroke/CMakeLists.txt
@@ -39,7 +39,7 @@ target_include_directories(pathstroke PUBLIC
 
 # special case begin
 if(NOT TARGET painting_shared::painting_shared)
-  add_subdirectory(../shared painting_shared)
+    include(../shared/use_lib.cmake)
 endif()
 # special case end
 

diff --git a/examples/widgets/painting/shared/CMakeLists.txt b/examples/widgets/painting/shared/CMakeLists.txt
@@ -1,14 +1,6 @@
 # special case skip regeneration
 # Port of shared.pri to be included by painting examples
 
-if(NOT TARGET Qt::Widgets)
-    find_package(Qt6 REQUIRED COMPONENTS Widgets)
-endif()
-
-if(NOT TARGET Qt::OpenGL)
-    find_package(Qt6 OPTIONAL_COMPONENTS OpenGL)
-endif()
-
 add_library(painting_shared OBJECT)
 add_library(painting_shared::painting_shared ALIAS painting_shared)
 qt6_wrap_cpp(moc_files arthurwidgets.h hoverpoints.h) # no automoc for OBJECT libs:-/

diff --git a/examples/widgets/painting/shared/use_lib.cmake b/examples/widgets/painting/shared/use_lib.cmake
@@ -0,0 +1,13 @@
+# Include this file in your example project to use the library defined in this directory.
+# This avoids find_package calls in a directory scope different from the directory scope of the
+# consuming target.
+
+if(NOT TARGET Qt::Widgets)
+    find_package(Qt6 REQUIRED COMPONENTS Widgets)
+endif()
+
+if(NOT TARGET Qt::OpenGL)
+    find_package(Qt6 OPTIONAL_COMPONENTS OpenGL)
+endif()
+
+add_subdirectory("${CMAKE_CURRENT_LIST_DIR}" painting_shared)