diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 16:43:46 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2018-07-05 17:04:55 -0400 |
| commit | b8d3227c3421f9408fbba3c7d392d4ae68790bfa (patch) | |
| tree | f60eb58045351d9fb32ab33af8eb91ecdea3a4b2 /src/components/interfaces | |
| parent | 92d03d64236864a191c5e8ab9fa3c1c35111a486 (diff) | |
| parent | 3ca6e219ad6325e4ae5486df0f1071c90430a259 (diff) | |
| download | sdl_core-b8d3227c3421f9408fbba3c7d392d4ae68790bfa.tar.gz | |
Merge remote-tracking branch 'origin/feature/remove_qt_hmi_api_dbus' into develop
# Conflicts:
# src/components/application_manager/CMakeLists.txt
# src/components/application_manager/include/application_manager/commands/mobile/get_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/subscribe_vehicle_data_request.h
# src/components/application_manager/include/application_manager/commands/mobile/unsubscribe_vehicle_data_request.h
# src/components/application_manager/src/commands/mobile/get_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/subscribe_vehicle_data_request.cc
# src/components/application_manager/src/commands/mobile/unsubscribe_vehicle_data_request.cc
# src/components/application_manager/src/hmi_command_factory.cc
# src/components/application_manager/src/message_helper/message_helper.cc
# src/components/application_manager/test/commands/hmi/dummy_hmi_commands_test.cc
# src/components/application_manager/test/commands/hmi/hmi_notifications/hmi_notifications_test.cc
# src/components/application_manager/test/commands/mobile/get_vehicle_data_request_test.cc
Diffstat (limited to 'src/components/interfaces')
| -rw-r--r-- | src/components/interfaces/CMakeLists.txt | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/src/components/interfaces/CMakeLists.txt b/src/components/interfaces/CMakeLists.txt index 1ea481f11a..660cbd661d 100644 --- a/src/components/interfaces/CMakeLists.txt +++ b/src/components/interfaces/CMakeLists.txt @@ -44,31 +44,8 @@ add_library(v4_protocol_v1_2_no_extra ${CMAKE_CURRENT_BINARY_DIR}/v4_protocol_v1 generate_interface("MOBILE_API.xml" "mobile_apis" "sdlrpcv2") add_library(MOBILE_API ${CMAKE_CURRENT_BINARY_DIR}/MOBILE_API_schema.cc) -if(HMI_JSON_API) - generate_interface("HMI_API.xml" "hmi_apis" "jsonrpc") - add_library(HMI_API ${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc) -endif() - -if(HMI_DBUS_API) - generate_interface("QT_HMI_API.xml" "hmi_apis" "jsonrpc") - - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HMI_API.h" - COMMAND sed "-e" "s/QT_HMI_API/HMI_API/g" "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API.h" > "${CMAKE_CURRENT_BINARY_DIR}/HMI_API.h" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API.h" - ) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.h" - COMMAND sed "-e" "s/QT_HMI_API/HMI_API/g" "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API_schema.h" > "${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.h" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API_schema.h" - ) - add_custom_command( - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc" - COMMAND sed "-e" "s/QT_HMI_API/HMI_API/g" "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API_schema.cc" > "${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc" - DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/QT_HMI_API_schema.cc" "${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.h" "${CMAKE_CURRENT_BINARY_DIR}/HMI_API.h") - - add_library(HMI_API ${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc) -endif() +generate_interface("HMI_API.xml" "hmi_apis" "jsonrpc") +add_library(HMI_API ${CMAKE_CURRENT_BINARY_DIR}/HMI_API_schema.cc) target_link_libraries(v4_protocol_v1_2_no_extra Utils) target_link_libraries(MOBILE_API Utils) |