CMake: Simplify Qt detection

2023-09-16 14:06:09 +02:00
parent 7e684885cf
commit e201f71a74
12 changed files with 83 additions and 111 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -162,84 +162,52 @@ find_package(FFTW3)
 find_package(GTest)
 find_library(GMOCK_LIBRARY gmock)

-option(QT_VERSION_MAJOR "Qt version to use (5 or 6)")
 option(BUILD_WITH_QT5 "Build with Qt 5" OFF)
 option(BUILD_WITH_QT6 "Build with Qt 6" OFF)

-if(WITH_QT6)
-  set(BUILD_WITH_QT6 ON)
-endif()
-if(QT_MAJOR_VERSION)
-  set(QT_VERSION_MAJOR ${QT_MAJOR_VERSION})
+if(BUILD_WITH_QT6)
+  set(QT_VERSION_MAJOR 6)
+elseif(BUILD_WITH_QT5)
+  set(QT_VERSION_MAJOR 5)
 endif()

-if(QT_VERSION_MAJOR)
-  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+if(NOT QT_VERSION_MAJOR)
+  message(STATUS "QT_VERSION_MAJOR, BUILD_WITH_QT5 or BUILD_WITH_QT6 not set, detecting Qt version...")
+  find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
 endif()
+
+if(QT_VERSION_MAJOR EQUAL 6)
+  set(QT_MIN_VERSION 6.0)
+elseif(QT_VERSION_MAJOR EQUAL 5)
+  set(QT_MIN_VERSION 5.12)
+else()
+  message(FATAL_ERROR "Invalid QT_VERSION_MAJOR.")
+endif()
+
+set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
+
 set(QT_COMPONENTS Core Concurrent Gui Widgets Network Sql)
+set(QT_OPTIONAL_COMPONENTS LinguistTools Test)
 if(DBUS_FOUND AND NOT WIN32)
  list(APPEND QT_COMPONENTS DBus)
 endif()
-set(QT_OPTIONAL_COMPONENTS Test)
-set(QT_MIN_VERSION 5.12)
-
-if(BUILD_WITH_QT6 OR QT_VERSION_MAJOR EQUAL 6)
-  set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
-  set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
-elseif(BUILD_WITH_QT5 OR QT_VERSION_MAJOR EQUAL 5)
-  set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
-  set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
-else()
-  # Automatically detect Qt version.
-  find_package(QT NAMES Qt6 Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
-  if(QT_FOUND AND QT_VERSION_MAJOR EQUAL 6)
-    set(BUILD_WITH_QT6 ON CACHE BOOL "" FORCE)
-    set(QT_VERSION_MAJOR 6 CACHE STRING "" FORCE)
-  elseif(QT_FOUND AND QT_VERSION_MAJOR EQUAL 5)
-    set(BUILD_WITH_QT5 ON CACHE BOOL "" FORCE)
-    set(QT_VERSION_MAJOR 5 CACHE STRING "" FORCE)
-  else()
-    message(FATAL_ERROR "Missing Qt.")
-  endif()
+if(X11_FOUND AND QT_VERSION_MAJOR EQUAL 5)
+  list(APPEND QT_COMPONENTS X11Extras)
 endif()

-if(QT_VERSION_MAJOR)
-  set(QT_DEFAULT_MAJOR_VERSION ${QT_VERSION_MAJOR})
-endif()
+find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} COMPONENTS ${QT_COMPONENTS} REQUIRED OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})

-if(X11_FOUND AND BUILD_WITH_QT5)
-  list(APPEND QT_OPTIONAL_COMPONENTS X11Extras)
-endif()
-
-find_package(Qt${QT_VERSION_MAJOR} ${QT_MIN_VERSION} REQUIRED COMPONENTS ${QT_COMPONENTS} OPTIONAL_COMPONENTS ${QT_OPTIONAL_COMPONENTS})
-
-set(QtCore_LIBRARIES Qt${QT_VERSION_MAJOR}::Core)
-set(QtConcurrent_LIBRARIES Qt${QT_VERSION_MAJOR}::Concurrent)
-set(QtGui_LIBRARIES Qt${QT_VERSION_MAJOR}::Gui)
-set(QtWidgets_LIBRARIES Qt${QT_VERSION_MAJOR}::Widgets)
-set(QtNetwork_LIBRARIES Qt${QT_VERSION_MAJOR}::Network)
-set(QtSql_LIBRARIES Qt${QT_VERSION_MAJOR}::Sql)
-set(QT_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Concurrent Qt${QT_VERSION_MAJOR}::Gui Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::Network Qt${QT_VERSION_MAJOR}::Sql)
 if(Qt${QT_VERSION_MAJOR}DBus_FOUND)
-  set(QtDBus_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
-  list(APPEND QT_LIBRARIES Qt${QT_VERSION_MAJOR}::DBus)
  get_target_property(QT_DBUSXML2CPP_EXECUTABLE Qt${QT_VERSION_MAJOR}::qdbusxml2cpp LOCATION)
 endif()
-if(BUILD_WITH_QT5 AND Qt5X11Extras_FOUND)
-  set(HAVE_X11EXTRAS ON)
-  set(QtX11Extras_LIBRARIES Qt5::X11Extras)
-  list(APPEND QT_LIBRARIES Qt5::X11Extras)
-endif()
-if(Qt${QT_VERSION_MAJOR}Test_FOUND)
-  set(QtTest_LIBRARIES Qt${QT_VERSION_MAJOR}::Test)
-endif()
-
-find_package(Qt${QT_VERSION_MAJOR} QUIET COMPONENTS LinguistTools CONFIG)
 if(Qt${QT_VERSION_MAJOR}LinguistTools_FOUND)
-  set(QT_LCONVERT_EXECUTABLE Qt${QT_VERSION_MAJOR}::lconvert)
+  get_target_property(QT_LCONVERT_EXECUTABLE Qt${QT_VERSION_MAJOR}::lconvert LOCATION)
+endif()
+if(Qt${QT_VERSION_MAJOR}X11Extras_FOUND)
+  set(HAVE_X11EXTRAS ON)
 endif()

-if(BUILD_WITH_QT5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
+if(QT_VERSION_MAJOR EQUAL 5 AND Qt5Core_VERSION VERSION_LESS 5.15.0)
  macro(qt_add_resources)
    qt5_add_resources(${ARGN})
  endmacro()
@@ -280,9 +248,9 @@ if(X11_FOUND)
  endif()

  # Check for QX11Application (Qt 6 compiled with XCB).
-  if(BUILD_WITH_QT6 AND Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.2.0)
+  if(QT_VERSION_MAJOR EQUAL 6 AND Qt6Gui_VERSION VERSION_GREATER_EQUAL 6.2.0)
    set(CMAKE_REQUIRED_FLAGS "-std=c++17")
-    set(CMAKE_REQUIRED_LIBRARIES ${QtCore_LIBRARIES} ${QtGui_LIBRARIES})
+    set(CMAKE_REQUIRED_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Gui)
    check_cxx_source_compiles("
    #include <QGuiApplication>
    int main() {
@@ -346,11 +314,7 @@ if(APPLE)
 endif()

 if(WIN32)
-  if(BUILD_WITH_QT6)
-    pkg_check_modules(QTSPARKLE qtsparkle-qt6)
-  else()
-    pkg_check_modules(QTSPARKLE qtsparkle-qt5)
-  endif()
+  pkg_check_modules(QTSPARKLE qtsparkle-qt${QT_VERSION_MAJOR})
  if(QTSPARKLE_FOUND)
    set(HAVE_QTSPARKLE ON)
  endif()
@@ -384,6 +348,7 @@ optional_component(LIBPULSE ON "PulseAudio integration"

 optional_component(DBUS ON "D-Bus support"
  DEPENDS "D-Bus" DBUS_FOUND
+  DEPENDS "Qt D-Bus" Qt${QT_VERSION_MAJOR}DBus_FOUND
 )

 optional_component(GSTREAMER ON "Engine: GStreamer backend"
@@ -409,7 +374,7 @@ optional_component(MUSICBRAINZ ON "MusicBrainz integration"
  DEPENDS "gstreamer" HAVE_GSTREAMER
 )

-if(X11_FOUND OR HAVE_DBUS OR APPLE OR WIN32)
+if(X11_FOUND OR (HAVE_DBUS AND Qt${QT_VERSION_MAJOR}DBus_FOUND) OR APPLE OR WIN32)
  set(HAVE_GLOBALSHORTCUTS_SUPPORT ON)
 endif()

@@ -431,7 +396,8 @@ optional_component(AUDIOCD ON "Devices: Audio CD support"
 )

 optional_component(UDISKS2 ON "Devices: UDisks2 backend"
-  DEPENDS "D-Bus support" DBUS_FOUND
+  DEPENDS "D-Bus" DBUS_FOUND
+  DEPENDS "Qt D-Bus" Qt${QT_VERSION_MAJOR}DBus_FOUND
 )

 optional_component(GIO ON "Devices: GIO device backend"
@@ -453,17 +419,10 @@ optional_component(LIBMTP ON "Devices: MTP support"
  DEPENDS "libmtp" LIBMTP_FOUND
 )

-if(BUILD_WITH_QT6)
-  optional_component(TRANSLATIONS ON "Translations"
-    DEPENDS "gettext" GETTEXT_FOUND
-    DEPENDS "Qt6LinguistTools" Qt6LinguistTools_FOUND
-  )
-else()
-  optional_component(TRANSLATIONS ON "Translations"
-    DEPENDS "gettext" GETTEXT_FOUND
-    DEPENDS "Qt5LinguistTools" Qt5LinguistTools_FOUND
-  )
-endif()
+optional_component(TRANSLATIONS ON "Translations"
+  DEPENDS "gettext" GETTEXT_FOUND
+  DEPENDS "Qt LinguistTools" Qt${QT_VERSION_MAJOR}LinguistTools_FOUND
+)

 option(INSTALL_TRANSLATIONS "Install translations" OFF)

@@ -499,7 +458,7 @@ endif()
 if(NOT CMAKE_CROSSCOMPILING)
  # Check that we have Qt with sqlite driver
  set(CMAKE_REQUIRED_FLAGS "-std=c++17")
-  set(CMAKE_REQUIRED_LIBRARIES ${QtCore_LIBRARIES} ${QtSql_LIBRARIES})
+  set(CMAKE_REQUIRED_LIBRARIES Qt${QT_VERSION_MAJOR}::Core Qt${QT_VERSION_MAJOR}::Sql)
  check_cxx_source_runs("
    #include <QSqlDatabase>
    #include <QSqlQuery>
@@ -565,7 +524,7 @@ if(HAVE_MOODBAR)
  add_subdirectory(ext/gstmoodbar)
 endif()

-if(GTest_FOUND AND GMOCK_LIBRARY AND QtTest_LIBRARIES)
+if(GTest_FOUND AND GMOCK_LIBRARY AND Qt${QT_VERSION_MAJOR}Test_FOUND)
  add_subdirectory(tests)
 endif()