From c1557903ddefeed660a581410442fe50490d1bb0 Mon Sep 17 00:00:00 2001 From: jacobkeeler Date: Thu, 1 Feb 2018 10:42:03 -0500 Subject: Remove references to QT HMI --- CMakeLists.txt | 43 ++++--------------------------------------- 1 file changed, 4 insertions(+), 39 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index b8fd497a09..f005a16068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,6 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake) #Jenkins integration section #dont modify this section if you dont know details about integration with Jenkins!!! set (HMI "web" CACHE STRING "HMI type") -option(HMI2 "Use Qt HMI" OFF) option(EXTENDED_MEDIA_MODE "Turn on and off extended Madia Manager features relates to PulseAudio A2DP and GStreamer" OFF) option(BUILD_SHARED_LIBS "Build all libraries as shared (if ON) or static (if OFF)" OFF) option(BUILD_BT_SUPPORT "Bluetooth support" ON) @@ -90,15 +89,12 @@ else () endif() if (HMI_TYPE_OPTION) - if (${HMI_TYPE_OPTION} STREQUAL "HTML5") - message(STATUS "Jenkins integration: select HTML5 HMI") - set (HMI "web") - elseif (${HMI_TYPE_OPTION} STREQUAL "NONE") + if (${HMI_TYPE_OPTION} STREQUAL "NONE") message(STATUS "Jenkins integration: select HMI none") set (HMI "no") else () - message(STATUS "Jenkins integration: select QML HMI none") - set (HMI "qt") + message(STATUS "Jenkins integration: select HTML5 HMI") + set (HMI "web") endif() endif() @@ -324,38 +320,10 @@ if (EXTENDED_MEDIA_MODE) add_definitions(${GLIB2_CFLAGS}) endif() -if(HMI STREQUAL "qt") - if(CMAKE_SYSTEM_NAME STREQUAL "QNX") - set(qt_version "4.8.5") - else() - set(qt_version "5.1.0") - endif() - - execute_process( - COMMAND ${CMAKE_SOURCE_DIR}/FindQt.sh -v ${qt_version} - OUTPUT_VARIABLE qt_bin_dir - ) - message(STATUS "Binary directory Qt ${qt_version} is ${qt_bin_dir}") - set(ENV{PATH} ${qt_bin_dir}:$ENV{PATH}) - - if(CMAKE_SYSTEM_NAME STREQUAL "QNX") - find_package(Qt4 ${qt_version} REQUIRED QtCore QtGui QtDBus QtDeclarative) - else () - find_package(Qt5Core REQUIRED) - find_package(Qt5DBus REQUIRED) - find_package(Qt5Qml REQUIRED) - find_package(Qt5Quick REQUIRED) - set(qmlplugindump_binary ${qt_bin_dir}/qmlplugindump) - endif() -endif() - # Building application # --- Type HMI -if (HMI STREQUAL "qt") - set(QT_HMI ON) - add_definitions(-DQT_HMI) -elseif (HMI STREQUAL "web") +if (HMI STREQUAL "web") set(WEB_HMI ON) add_definitions(-DWEB_HMI) else () @@ -363,9 +331,6 @@ else () add_definitions(-DNO_HMI) endif () -if (HMI STREQUAL "qt" AND NOT DEFINED HMIADAPTER) - set(HMIADAPTER "dbus") -endif() if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER) set(HMIADAPTER "messagebroker") endif() -- cgit v1.2.1