Skip to content

Commit

Permalink
Remove Qt6Core5Compat dependency
Browse files Browse the repository at this point in the history
Signed-off-by: Matthew J. Milner <[email protected]>
  • Loading branch information
matterhorn103 committed Oct 24, 2024
1 parent fe3736b commit 47e5fc0
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 15 deletions.
5 changes: 1 addition & 4 deletions avogadro/molequeue/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if(QT_VERSION EQUAL 6)
find_package(Qt6 COMPONENTS Widgets Network Core5Compat REQUIRED)
find_package(Qt6 COMPONENTS Widgets Network REQUIRED)
else()
find_package(Qt5 COMPONENTS Widgets Network REQUIRED)
endif()
Expand Down Expand Up @@ -43,6 +43,3 @@ target_sources(MoleQueue PRIVATE ${UI_SOURCES})
avogadro_add_library(MoleQueue ${HEADERS} ${SOURCES})
set_target_properties(MoleQueue PROPERTIES AUTOMOC TRUE)
target_link_libraries(MoleQueue PUBLIC Avogadro::QtGui Qt::Widgets Qt::Network)
if(QT_VERSION EQUAL 6)
target_link_libraries(MoleQueue PRIVATE Qt6::Core5Compat)
endif()
5 changes: 1 addition & 4 deletions avogadro/qtgui/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
if(QT_VERSION EQUAL 6)
find_package(Qt6 COMPONENTS Widgets Core5Compat REQUIRED)
find_package(Qt6 COMPONENTS Widgets REQUIRED)
else()
find_package(Qt5 COMPONENTS Widgets REQUIRED)
endif()
Expand Down Expand Up @@ -121,6 +121,3 @@ target_sources(QtGui PRIVATE ${RC_SOURCES})

avogadro_add_library(QtGui)
target_link_libraries(QtGui PUBLIC Avogadro::IO Qt::Widgets)
if(QT_VERSION EQUAL 6)
target_link_libraries(QtGui PRIVATE Qt6::Core5Compat)
endif()
7 changes: 0 additions & 7 deletions avogadro/qtplugins/openbabel/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
if(QT_VERSION EQUAL 6)
find_package(Qt6 COMPONENTS Core5Compat REQUIRED)
endif()

set(openbabel_srcs
conformersearchdialog.cpp
obcharges.cpp
Expand All @@ -26,6 +22,3 @@ avogadro_plugin(OpenBabel
)

target_link_libraries(OpenBabel PRIVATE Avogadro::IO Avogadro::Calc nlohmann_json::nlohmann_json)
if(QT_VERSION EQUAL 6)
target_link_libraries(OpenBabel PRIVATE Qt6::Core5Compat)
endif()

0 comments on commit 47e5fc0

Please sign in to comment.