diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 28 |
1 files changed, 2 insertions, 26 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 49959597a9..1a180b6cf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ option(ENABLE_GCOV "gcov code coverage feature" OFF) option(ENABLE_SANITIZE "Sanitize tool" OFF) option(ENABLE_SECURITY "Security Ford protocol protection" ON) option(ENABLE_HMI_PTU_DECRYPTION "Policy table update parsed by hmi" ON) -option(REMOTE_CONTROL "Enable Reverse functionality" ON) option(USE_COTIRE "Use Cotire to speed up build (currently only for commands tests)" ON) option(USE_GOLD_LD "Use gold linker intead of GNU linker" ON) option(USE_CCACHE "Turn on ccache usage" ON) @@ -113,9 +112,6 @@ if (HMI_ADAPTER_OPTION) if (${HMI_ADAPTER_OPTION} STREQUAL "MESSAGEBROKER") message(STATUS "Jenkins integration: selected HMI adapter MESSAGEBROKER") set (HMIADAPTER "messagebroker") - elseif (${HMI_ADAPTER_OPTION} STREQUAL "DBUS") - message(STATUS "Jenkins integration: selected HMI adapter DBUS") - set (HMIADAPTER "dbus") endif() endif() @@ -156,11 +152,6 @@ if (OS_TYPE_OPTION) endif() endif() -if (REMOTE_CONTROL) - add_definitions(-DSDL_REMOTE_CONTROL) - message(STATUS "Remote control support is enabled (aka Reverse SDL or SDL-RC)") -endif() - #Jenkins integration section end #Deliver Build Configuration @@ -174,12 +165,6 @@ get_property(cValue CACHE EXTENDED_POLICY PROPERTY VALUE) file(APPEND "${build_config_path}" "//${cHelpString}\n") file(APPEND "${build_config_path}" "EXTENDED_POLICY:${cType}=${cValue}\n\n") -get_property(cHelpString CACHE REMOTE_CONTROL PROPERTY HELPSTRING) -get_property(cType CACHE REMOTE_CONTROL PROPERTY TYPE) -get_property(cValue CACHE REMOTE_CONTROL PROPERTY VALUE) -file(APPEND "${build_config_path}" "//${cHelpString}\n") -file(APPEND "${build_config_path}" "REMOTE_CONTROL:${cType}=${cValue}\n\n") - get_property(cHelpString CACHE BUILD_BT_SUPPORT PROPERTY HELPSTRING) get_property(cType CACHE BUILD_BT_SUPPORT PROPERTY TYPE) get_property(cValue CACHE BUILD_BT_SUPPORT PROPERTY VALUE) @@ -250,7 +235,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/") set(CMAKE_INSTALL_PREFIX ${CMAKE_CURRENT_BINARY_DIR}) set(ARCHIVE_OUTPUT_DIRECTORY ./bin) -set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror -Wno-deprecated-declarations -Wuninitialized -Wvla") +set(CMAKE_CXX_FLAGS "-fPIC -std=gnu++0x -Wall -Werror -Wuninitialized -Wvla") if (USE_GOLD_LD) execute_process(COMMAND ld -v OUTPUT_VARIABLE result) @@ -393,15 +378,6 @@ if (HMI STREQUAL "web" AND NOT DEFINED HMIADAPTER) set(HMIADAPTER "messagebroker") endif() -if (HMIADAPTER STREQUAL "dbus") - set(HMI_DBUS_API ON) - add_definitions(-DDBUS_HMIADAPTER) - add_definitions(-DHMI_DBUS_API) - - find_package(DBus REQUIRED) - set(DBUS_LIBS_DIRECTORY ${DBUS_LIBRARY_DIRS} PARENT_SCOPE) - message(${DBUS_INCLUDE_DIRS}) -endif() if (HMIADAPTER STREQUAL "messagebroker") set(HMI_JSON_API ON) add_definitions(-DMESSAGEBROKER_HMIADAPTER) @@ -503,4 +479,4 @@ find_package(Doxygen) message(STATUS "sudo apt-get install doxygen graphviz") message(STATUS "To enable processing of MscGen comments please install mscgen") message(STATUS "sudo apt-get install mscgen") -endif()
\ No newline at end of file +endif() |