diff options
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7b81c40b2..034c89c17 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -158,11 +158,7 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") else() set(SUBSURFACE_TARGET subsurface) endif() - list(APPEND QT_EXTRA_COMPONENTS Quick) - list(APPEND QT_EXTRA_COMPONENTS Location) list(APPEND QT_EXTRA_COMPONENTS QuickWidgets) - list(APPEND QT_EXTRA_LIBRARIES Qt5::Quick) - list(APPEND QT_EXTRA_LIBRARIES Qt5::Location) list(APPEND QT_EXTRA_LIBRARIES Qt5::QuickWidgets) remove_definitions(-DSUBSURFACE_MOBILE) elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") @@ -171,11 +167,7 @@ elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") else() set(SUBSURFACE_TARGET subsurface-mobile) endif() - list(APPEND QT_EXTRA_COMPONENTS Quick) - list(APPEND QT_EXTRA_COMPONENTS Location) list(APPEND QT_EXTRA_COMPONENTS QuickControls2) - list(APPEND QT_EXTRA_LIBRARIES Qt5::Quick) - list(APPEND QT_EXTRA_LIBRARIES Qt5::Location) list(APPEND QT_EXTRA_LIBRARIES Qt5::QuickControls2) add_definitions(-DSUBSURFACE_MOBILE) message(STATUS "Building Subsurface-mobile requires BT support") @@ -232,8 +224,8 @@ if(BTSUPPORT) list(APPEND QT_EXTRA_LIBRARIES Qt5::Bluetooth) endif() -find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network Svg Test LinguistTools Positioning ${QT_EXTRA_COMPONENTS}) -set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Svg Qt5::Positioning ${QT_EXTRA_LIBRARIES}) +find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network Svg Test LinguistTools Positioning Quick Location ${QT_EXTRA_COMPONENTS}) +set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Svg Qt5::Positioning Qt5::Quick Qt5::Location ${QT_EXTRA_LIBRARIES}) set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test) #disable bluetooth if Qt version is ancient. |