Specified target directories for qtopengl and rendering so that expor…

…t headers are found correctly. Added Qt6::OpenGL and Qt6::OpenGLWidgets as dependencies in a few places as necessary.
OpenChemistry · Nov 16, 2023 · 153c0f7 · 153c0f7
1 parent a43193e
commit 153c0f7
Show file tree

Hide file tree

Showing 13 changed files with 96 additions and 11 deletions.
diff --git a/avogadro/qtplugins/aligntool/CMakeLists.txt b/avogadro/qtplugins/aligntool/CMakeLists.txt
@@ -19,4 +19,9 @@ avogadro_plugin(AlignTool
   "${aligntool_rcs}"
 )
 
-target_link_libraries(AlignTool PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(AlignTool PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(AlignTool
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering)
+
diff --git a/avogadro/qtplugins/bondcentrictool/CMakeLists.txt b/avogadro/qtplugins/bondcentrictool/CMakeLists.txt
@@ -19,4 +19,12 @@ avogadro_plugin(BondCentric
   "${bondcentrictool_rcs}"
 )
 
-target_link_libraries(BondCentric PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(BondCentric
+  PRIVATE
+    Avogadro::Rendering
+    Avogadro::QtOpenGL)
+
+target_include_directories(BondCentric
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/editor/CMakeLists.txt b/avogadro/qtplugins/editor/CMakeLists.txt
@@ -21,4 +21,9 @@ avogadro_plugin(Editor
   "${editor_rcs}"
 )
 
-target_link_libraries(Editor PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(Editor PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(Editor
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/focus/CMakeLists.txt b/avogadro/qtplugins/focus/CMakeLists.txt
@@ -7,4 +7,9 @@ avogadro_plugin(Focus
   ""
 )
 
-target_link_libraries(Focus PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(Focus PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(Focus
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/label/CMakeLists.txt b/avogadro/qtplugins/label/CMakeLists.txt
@@ -25,4 +25,12 @@ avogadro_plugin(LabelEditor
 )
 
 target_link_libraries(Label LINK_PRIVATE Avogadro::Rendering)
-target_link_libraries(LabelEditor LINK_PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(LabelEditor
+  LINK_PRIVATE
+    Avogadro::Rendering
+    Avogadro::QtOpenGL)
+
+target_include_directories(LabelEditor
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/manipulator/CMakeLists.txt b/avogadro/qtplugins/manipulator/CMakeLists.txt
@@ -20,4 +20,12 @@ avogadro_plugin(Manipulator
   "${manipulator_rcs}"
 )
 
-target_link_libraries(Manipulator PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(Manipulator
+  PRIVATE
+    Avogadro::Rendering
+    Avogadro::QtOpenGL)
+
+target_include_directories(Manipulator
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/measuretool/CMakeLists.txt b/avogadro/qtplugins/measuretool/CMakeLists.txt
@@ -19,4 +19,9 @@ avogadro_plugin(MeasureTool
   "${measuretool_rcs}"
 )
 
-target_link_libraries(MeasureTool PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(MeasureTool PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(MeasureTool
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/navigator/CMakeLists.txt b/avogadro/qtplugins/navigator/CMakeLists.txt
@@ -19,4 +19,9 @@ avogadro_plugin(Navigator
   "${navigator_rcs}"
 )
 
-target_link_libraries(Navigator PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(Navigator PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(Navigator
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/playertool/CMakeLists.txt b/avogadro/qtplugins/playertool/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(Qt6 REQUIRED COMPONENTS OpenGL OpenGLWidgets)
+
 avogadro_plugin(PlayerTool
   "Player tool"
   ToolPlugin
@@ -12,4 +14,12 @@ target_link_libraries(PlayerTool
   PRIVATE
     gwavi
     gif-h
+    Qt6::OpenGL
+    Qt6::OpenGLWidgets
+    Avogadro::Rendering
     Avogadro::QtOpenGL)
+
+target_include_directories(PlayerTool
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/resetview/CMakeLists.txt b/avogadro/qtplugins/resetview/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(Qt6 REQUIRED COMPONENTS OpenGLWidgets)
+
 avogadro_plugin(ResetView
   "Manipulate the view camera."
   ExtensionPlugin
@@ -7,4 +9,9 @@ avogadro_plugin(ResetView
   ""
 )
 
-target_link_libraries(ResetView PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(ResetView PRIVATE Qt6::OpenGLWidgets Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(ResetView
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/selectiontool/CMakeLists.txt b/avogadro/qtplugins/selectiontool/CMakeLists.txt
@@ -19,4 +19,9 @@ avogadro_plugin(Selection
   "${tool_rcs}"
 )
 
-target_link_libraries(Selection PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(Selection PRIVATE Avogadro::Rendering Avogadro::QtOpenGL)
+
+target_include_directories(Selection
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/surfaces/CMakeLists.txt b/avogadro/qtplugins/surfaces/CMakeLists.txt
@@ -1,3 +1,5 @@
+find_package(Qt6 REQUIRED COMPONENTS OpenGL)
+
 set(surfaces_srcs
   gaussiansetconcurrent.cpp
   slatersetconcurrent.cpp
@@ -16,10 +18,17 @@ avogadro_plugin(Surfaces
 
 target_link_libraries(Surfaces
   PRIVATE
+    Qt6::OpenGL
     Avogadro::Calc
     Avogadro::QuantumIO
     Avogadro::QtOpenGL
+    Avogadro::Rendering
     Qt::Concurrent
     gif-h
     gwavi
     tinycolormap)
+
+target_include_directories(Surfaces
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)
diff --git a/avogadro/qtplugins/templatetool/CMakeLists.txt b/avogadro/qtplugins/templatetool/CMakeLists.txt
@@ -21,4 +21,9 @@ avogadro_plugin(TemplateTool
   "${template_rcs}"
 )
 
-target_link_libraries(TemplateTool LINK_PRIVATE Avogadro::QtOpenGL)
+target_link_libraries(TemplateTool LINK_PRIVATE Avogadro::QtOpenGL Avogadro::Rendering)
+
+target_include_directories(TemplateTool
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR}/../../rendering
+    ${CMAKE_CURRENT_BINARY_DIR}/../../qtopengl)