Merge pull request #1902 from nicolasfella/glwid

Link publicly against Qt6::OpenGLWidgets
OpenChemistry · Dec 30, 2024 · 4d12b05 · 4d12b05
2 parents d231082 + 4d421f2
commit 4d12b05
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/avogadro/qtopengl/CMakeLists.txt b/avogadro/qtopengl/CMakeLists.txt
@@ -21,5 +21,5 @@ target_sources(QtOpenGL PRIVATE
 avogadro_add_library(QtOpenGL)
 target_link_libraries(QtOpenGL PUBLIC Avogadro::Rendering Avogadro::QtGui Qt::Widgets)
 if(QT_VERSION EQUAL 6)
-  target_link_libraries(QtOpenGL PRIVATE Qt6::OpenGLWidgets)
+  target_link_libraries(QtOpenGL PUBLIC Qt6::OpenGLWidgets)
 endif()
diff --git a/cmake/AvogadroLibsConfig.cmake.in b/cmake/AvogadroLibsConfig.cmake.in
@@ -19,6 +19,12 @@ set(AvogadroLibs_CMAKE_DIR       "${AvogadroLibs_LIBRARY_DIR}/cmake/avogadrolibs
 set(AvogadroLibs_PLUGINS         "@AvogadroLibs_PLUGINS@")
 set(AvogadroLibs_STATIC_PLUGINS  "@AvogadroLibs_STATIC_PLUGINS@")
 
+include(CMakeFindDependencyMacro)
+
+if (@QT_VERSION@ EQUAL 6)
+  find_dependency(Qt6OpenGLWidgets)
+endif()
+
 if(NOT TARGET AvogadroCore)
   include("${AvogadroLibs_CMAKE_DIR}/AvogadroLibsTargets.cmake")
 endif()