summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorViktor Verebelyi <vviktor2@gmail.com>2020-09-17 01:18:13 +0100
committerViktor Verebelyi <vviktor2@gmail.com>2020-09-22 02:16:58 +0100
commit7ebdb31ab9cc76e02b5e6104a17aa0be4d6d1bb3 (patch)
treed8ca2c357ea164cd015e86ae0f6d29260abcd9cc
parent511922ab794579d151c8559479ae715c90720a64 (diff)
downloadnavit-7ebdb31ab9cc76e02b5e6104a17aa0be4d6d1bb3.tar.gz
Add:core:Add dependency for Qt5Gui
-rwxr-xr-xCMakeLists.txt17
1 files changed, 10 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f392e1f92..aa0b70390 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -222,16 +222,17 @@ find_package(Threads)
#Qt detection
if (NOT DISABLE_QT)
- find_package(Qt5Widgets)
+ find_package(Qt5Widgets)
find_package(Qt5Quick)
find_package(Qt5Positioning)
if (Qt5Widgets_FOUND OR Qt5Quick_FOUND OR Qt5Sensors_FOUND)
- add_feature (USE_QWIDGET "Qt5 Qt5Widget not found" FALSE)
- add_feature (USE_QML "Qt5 Qt5Quick not found" FALSE)
+ add_feature (USE_QWIDGET "Qt5 Qt5Widget not found" FALSE)
+ add_feature (USE_QML "Qt5 Qt5Quick not found" FALSE)
if (Qt5Widgets_FOUND OR Qt5Quick_FOUND)
find_package(Qt5Svg REQUIRED)
- find_package(Qt5DBus REQUIRED)
- find_package(Qt5Multimedia)
+ find_package(Qt5DBus REQUIRED)
+ find_package(Qt5Multimedia)
+ find_package(Qt5Gui)
find_package(espeak)
endif (Qt5Widgets_FOUND OR Qt5Quick_FOUND)
if (Qt5Positioning_FOUND)
@@ -365,7 +366,7 @@ if (Qt5Widgets_FOUND OR Qt5Quick_FOUND)
if(Qt5Quick_FOUND)
set_with_reason(USE_QML "Qt5Quick found" TRUE)
if(USE_QML)
- set(Qt5_ADDITIONAL_LIBRARIES ${Qt5_ADDITIONAL_LIBRARIES} ${Qt5Quick_LIBRARIES})
+ set(Qt5_ADDITIONAL_LIBRARIES ${Qt5_ADDITIONAL_LIBRARIES} ${Qt5Quick_LIBRARIES})
endif()
set_with_reason(gui/qt5_qml "Qt5 found" TRUE
${Qt5Quick_LIBRARIES})
@@ -374,7 +375,8 @@ if (Qt5Widgets_FOUND OR Qt5Quick_FOUND)
set_with_reason(graphics/qt5 "Qt5 found" TRUE
${Qt5_ADDITIONAL_LIBRARIES}
${Qt5Svg_LIBRARIES}
- ${Qt5DBus_LIBRARIES})
+ ${Qt5DBus_LIBRARIES}
+ ${Qt5Gui_LIBRARIES})
if (Qt5Multimedia_FOUND)
if (espeak_FOUND)
set_with_reason(support/espeak "native espeak found" FALSE)
@@ -537,6 +539,7 @@ add_feature(SVG2PNG "default" TRUE)
add_feature(SAMPLE_MAP "default" TRUE)
add_feature(NETWORK_INFO "default" FALSE)
add_feature(GUI_INTERNAL_VISUAL_DBG "default" FALSE)
+add_feature (USE_OPENGL "default" FALSE)
if (GUI_INTERNAL_VISUAL_DBG)
list(FIND ALL_MODULES gui/internal GUI_INTERNAL_ENABLED)