diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9b4fe41f7..360d53b02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,6 +88,9 @@ if(USE_PCH) include(cotire/CMake/cotire) endif() +# Load Qt5Core here as it can only be included once (QTBUG-87863) +find_package(Qt5Core REQUIRED) + add_subdirectory(lib) add_subdirectory(gui) add_subdirectory(gui-qml) diff --git a/src/cli/CMakeLists.txt b/src/cli/CMakeLists.txt index f9ae54227..bea05dd8d 100644 --- a/src/cli/CMakeLists.txt +++ b/src/cli/CMakeLists.txt @@ -2,7 +2,6 @@ project(cli) add_definitions(-DCLI=1) -find_package(Qt5Core REQUIRED) find_package(Qt5Network REQUIRED) set(QT_LIBRARIES Qt5::Core Qt5::Network) diff --git a/src/crash-reporter/CMakeLists.txt b/src/crash-reporter/CMakeLists.txt index b28d2ab73..7d2dfbee6 100644 --- a/src/crash-reporter/CMakeLists.txt +++ b/src/crash-reporter/CMakeLists.txt @@ -1,6 +1,5 @@ project(CrashReporter) -find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) find_package(Qt5Widgets REQUIRED) set(QT_LIBRARIES Qt5::Core Qt5::Gui Qt5::Widgets) diff --git a/src/e2e/CMakeLists.txt b/src/e2e/CMakeLists.txt index a90b090d1..2f81ce5fe 100644 --- a/src/e2e/CMakeLists.txt +++ b/src/e2e/CMakeLists.txt @@ -1,6 +1,5 @@ project(e2e) -find_package(Qt5Core REQUIRED) set(QT_LIBRARIES Qt5::Core) file(GLOB_RECURSE SOURCES "src/*.cpp") diff --git a/src/gui-qml/CMakeLists.txt b/src/gui-qml/CMakeLists.txt index 6fefd2476..5f8163974 100644 --- a/src/gui-qml/CMakeLists.txt +++ b/src/gui-qml/CMakeLists.txt @@ -4,7 +4,6 @@ add_definitions(-DGUI=1) add_subdirectory(languages) # Qt libraries -find_package(Qt5Core REQUIRED) find_package(Qt5Quick REQUIRED) find_package(Qt5Network REQUIRED) set(QT_LIBRARIES Qt5::Core Qt5::Quick Qt5::Network) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 23aa07285..3aef8f9cc 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -36,7 +36,6 @@ endif() # Qt libraries find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) find_package(Qt5Network REQUIRED) find_package(Qt5Multimedia REQUIRED) diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt index 6eb4b7a9c..eba704f34 100644 --- a/src/lib/CMakeLists.txt +++ b/src/lib/CMakeLists.txt @@ -1,7 +1,6 @@ project(lib) find_package(Qt5Concurrent REQUIRED) -find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) # For some classes such as QPixmap find_package(Qt5Network REQUIRED) find_package(Qt5Qml REQUIRED) diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index a4761d100..52196dd58 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -6,7 +6,6 @@ if(DEFINED HEADLESS) add_definitions(-DHEADLESS=1) endif() -find_package(Qt5Core REQUIRED) find_package(Qt5Gui REQUIRED) find_package(Qt5Test REQUIRED) find_package(Qt5Widgets REQUIRED)