Remove and tweak include_directories in plugins

Also spotted a few variables still being used for linking along with many calls to add the current binary directory to the include path. Signed-off-by: Marcus D. Hanwell <[email protected]>
cryos · Apr 29, 2023 · b88b26a · b88b26a · github-actions · Apr 29, 2023
1 parent 83b9c84
commit b88b26a
Show file tree

Hide file tree

Showing 23 changed files with 5 additions and 42 deletions.
diff --git a/avogadro/qtplugins/3dmol/CMakeLists.txt b/avogadro/qtplugins/3dmol/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(ThreeDMol
   "The 3DMol HTML Block Generator"
   ExtensionPlugin

diff --git a/avogadro/qtplugins/applycolors/CMakeLists.txt b/avogadro/qtplugins/applycolors/CMakeLists.txt
@@ -1,5 +1,4 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR}
-"${AvogadroLibs_SOURCE_DIR}/thirdparty/tinycolormap/include")
+include_directories("${AvogadroLibs_SOURCE_DIR}/thirdparty/tinycolormap/include")
 
 avogadro_plugin(ApplyColors
   "Extension to apply color schemes to atoms and residues."

diff --git a/avogadro/qtplugins/bonding/CMakeLists.txt b/avogadro/qtplugins/bonding/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(Bonding
   "Perform bonding operations."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/centroid/CMakeLists.txt b/avogadro/qtplugins/centroid/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(Centroid
   "Add centroid and center-of-mass."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/coloropacitymap/CMakeLists.txt b/avogadro/qtplugins/coloropacitymap/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}")
-
 set(_srcs
   coloropacitymap.cpp
   histogramwidget.cpp

diff --git a/avogadro/qtplugins/coordinateeditor/CMakeLists.txt b/avogadro/qtplugins/coordinateeditor/CMakeLists.txt
@@ -1,6 +1,3 @@
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(CoordinateEditor
   "Show a window with a free-text coordinate editor."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/copypaste/CMakeLists.txt b/avogadro/qtplugins/copypaste/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(CopyPaste
   "Interact with the clipboard."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/fetchpdb/CMakeLists.txt b/avogadro/qtplugins/fetchpdb/CMakeLists.txt
@@ -12,4 +12,4 @@ avogadro_plugin(FetchPDB
 )
 
 target_link_libraries(FetchPDB
-  PRIVATE Avogadro::IO ${Qt5Network_LIBRARIES})
+  PRIVATE Avogadro::IO Qt::Network)
diff --git a/avogadro/qtplugins/focus/CMakeLists.txt b/avogadro/qtplugins/focus/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(Focus
   "Focus the view on specific features."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/hydrogens/CMakeLists.txt b/avogadro/qtplugins/hydrogens/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(Hydrogens
   "Extension that adds/removes hydrogens on a molecule."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/importpqr/CMakeLists.txt b/avogadro/qtplugins/importpqr/CMakeLists.txt
@@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR
   ""
 )
 
-target_link_libraries(ImportPQR PRIVATE ${Qt5Network_LIBRARIES})
+target_link_libraries(ImportPQR PRIVATE Qt::Network)
diff --git a/avogadro/qtplugins/insertdna/CMakeLists.txt b/avogadro/qtplugins/insertdna/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR} "${AvogadroLibs_SOURCE_DIR}/thirdparty")
+include_directories("${AvogadroLibs_SOURCE_DIR}/thirdparty")
 
 avogadro_plugin(NucleicInput
   "Insert DNA/RNA sequences."

diff --git a/avogadro/qtplugins/insertfragment/CMakeLists.txt b/avogadro/qtplugins/insertfragment/CMakeLists.txt
@@ -1,7 +1,5 @@
 include(ExternalProject)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(InsertFragment
   "Insert molecular fragments and crystals."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/lineformatinput/CMakeLists.txt b/avogadro/qtplugins/lineformatinput/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(LineFormatInput
   "Enter line formats in a dialog window."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/molecularproperties/CMakeLists.txt b/avogadro/qtplugins/molecularproperties/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(MolecularProperties
   "Show a window with basic molecular properties."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/plugindownloader/CMakeLists.txt b/avogadro/qtplugins/plugindownloader/CMakeLists.txt
@@ -19,5 +19,5 @@ avogadro_plugin(PluginDownloader
   ""
 )
 
-target_link_libraries(PluginDownloader PRIVATE ${Qt5Network_LIBRARIES}
+target_link_libraries(PluginDownloader PRIVATE Qt::Network
   ${LIBARCHIVE_LIBRARIES})
diff --git a/avogadro/qtplugins/ply/CMakeLists.txt b/avogadro/qtplugins/ply/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(PLY
   "Render the scene using PLY."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/povray/CMakeLists.txt b/avogadro/qtplugins/povray/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(POVRay
   "Render the scene using POV-Ray."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/propertytables/CMakeLists.txt b/avogadro/qtplugins/propertytables/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(PropertyTables
   "Atom, Bond, Angle, Dihedral property tables."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/resetview/CMakeLists.txt b/avogadro/qtplugins/resetview/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(ResetView
   "Manipulate the view camera."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/select/CMakeLists.txt b/avogadro/qtplugins/select/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(Select
   "Extension that modifies selections."
   ExtensionPlugin

diff --git a/avogadro/qtplugins/svg/CMakeLists.txt b/avogadro/qtplugins/svg/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
 find_package(Qt${QT_VERSION} COMPONENTS Svg REQUIRED)
 
 avogadro_plugin(SVG

diff --git a/avogadro/qtplugins/vrml/CMakeLists.txt b/avogadro/qtplugins/vrml/CMakeLists.txt
@@ -1,5 +1,3 @@
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
 avogadro_plugin(VRML
   "Render the scene using VRML."
   ExtensionPlugin
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,4 @@ avogadro_plugin(ImportPQR @@
       ""
     )
-    target_link_libraries(ImportPQR PRIVATE ${Qt5Network_LIBRARIES})
+    target_link_libraries(ImportPQR PRIVATE Qt::Network)