diff options
Diffstat (limited to 'src/components/transport_manager')
-rw-r--r-- | src/components/transport_manager/CMakeLists.txt | 102 | ||||
-rw-r--r-- | src/components/transport_manager/test/CMakeLists.txt | 27 | ||||
-rw-r--r-- | src/components/transport_manager/test/raw_message_matcher.cc | 2 |
3 files changed, 54 insertions, 77 deletions
diff --git a/src/components/transport_manager/CMakeLists.txt b/src/components/transport_manager/CMakeLists.txt index fbe6018d6a..5d70aca285 100644 --- a/src/components/transport_manager/CMakeLists.txt +++ b/src/components/transport_manager/CMakeLists.txt @@ -28,8 +28,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -set(target TransportManager) -set(TM_SRC_DIR ${COMPONENTS_DIR}/transport_manager/src) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/platform.cmake) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories ( include @@ -42,83 +42,63 @@ include_directories ( ${LIBUSB_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} ) -if (BUILD_BT_SUPPORT) - include_directories( - ) -endif() -set (SOURCES - ${TM_SRC_DIR}/transport_manager_impl.cc - ${TM_SRC_DIR}/transport_manager_default.cc - ${TM_SRC_DIR}/transport_adapter/transport_adapter_listener_impl.cc - ${TM_SRC_DIR}/transport_adapter/transport_adapter_impl.cc - ${TM_SRC_DIR}/tcp/tcp_transport_adapter.cc - ${TM_SRC_DIR}/transport_adapter/threaded_socket_connection.cc - ${TM_SRC_DIR}/tcp/tcp_client_listener.cc - ${TM_SRC_DIR}/tcp/tcp_device.cc - ${TM_SRC_DIR}/tcp/tcp_socket_connection.cc - ${TM_SRC_DIR}/tcp/tcp_connection_factory.cc +set(PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src +) + +set(EXCLUDE_PATHS) + +set(LIBRARIES + ProtocolLibrary ) -if (BUILD_BT_SUPPORT) - list (APPEND SOURCES - ${TM_SRC_DIR}/bluetooth/bluetooth_device_scanner.cc - ${TM_SRC_DIR}/bluetooth/bluetooth_transport_adapter.cc - ${TM_SRC_DIR}/bluetooth/bluetooth_connection_factory.cc - ${TM_SRC_DIR}/bluetooth/bluetooth_socket_connection.cc - ${TM_SRC_DIR}/bluetooth/bluetooth_device.cc +if(BUILD_BT_SUPPORT) + list(APPEND LIBRARIES + bluetooth + ) +else() + list(APPEND EXCLUDE_PATHS + ${COMPONENTS_DIR}/transport_manager/include/transport_manager/bluetooth + ${COMPONENTS_DIR}/transport_manager/src/bluetooth ) endif() -if (BUILD_USB_SUPPORT) - list (APPEND SOURCES - ${TM_SRC_DIR}/usb/usb_aoa_adapter.cc - ${TM_SRC_DIR}/usb/usb_connection_factory.cc - ${TM_SRC_DIR}/usb/usb_device_scanner.cc - ) +if(BUILD_USB_SUPPORT) if (CMAKE_SYSTEM_NAME STREQUAL "Linux") - list (APPEND SOURCES - ${TM_SRC_DIR}/usb/libusb/usb_handler.cc - ${TM_SRC_DIR}/usb/libusb/usb_connection.cc - ${TM_SRC_DIR}/usb/libusb/platform_usb_device.cc + set(EXCLUDE_PATHS + ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/qnx + ${COMPONENTS_DIR}/transport_manager/src/usb/qnx + ) + list(APPEND LIBRARIES + Libusb-1.0.16 ) elseif(CMAKE_SYSTEM_NAME STREQUAL "QNX") - list(APPEND SOURCES - ${TM_SRC_DIR}/usb/qnx/usb_handler.cc - ${TM_SRC_DIR}/usb/qnx/usb_connection.cc - ${TM_SRC_DIR}/usb/qnx/platform_usb_device.cc + set(EXCLUDE_PATHS + ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb/libusb + ${COMPONENTS_DIR}/transport_manager/src/usb/libusb + ) + list(APPEND LIBRARIES + usbdi ) endif() -endif(BUILD_USB_SUPPORT) - - -if (CMAKE_SYSTEM_NAME STREQUAL "QNX") +else() + list(APPEND EXCLUDE_PATHS + ${COMPONENTS_DIR}/transport_manager/include/transport_manager/usb + ${COMPONENTS_DIR}/transport_manager/src/usb + ) endif() -add_library(${target} ${SOURCES}) -target_link_libraries(${target} ProtocolLibrary) +collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}") -if (BUILD_USB_SUPPORT) - if (CMAKE_SYSTEM_NAME STREQUAL "QNX") - target_link_libraries(${target} usbdi) - endif() -endif(BUILD_USB_SUPPORT) +add_library("TransportManager" ${SOURCES}) +target_link_libraries("TransportManager" ${LIBRARIES}) if(ENABLE_LOG) - target_link_libraries(${target} log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) -endif() - -if (BUILD_BT_SUPPORT) - target_link_libraries(${target} bluetooth) + target_link_libraries("TransportManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() -if (CMAKE_SYSTEM_NAME STREQUAL "QNX") -endif() - -add_library("transport_manager" ${SOURCES} - ${TRANSPORT_MANAGER_SOURCES} -) - if(BUILD_TESTS) add_subdirectory(test) endif() diff --git a/src/components/transport_manager/test/CMakeLists.txt b/src/components/transport_manager/test/CMakeLists.txt index da20f1d43c..757d0b4a63 100644 --- a/src/components/transport_manager/test/CMakeLists.txt +++ b/src/components/transport_manager/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2015, Ford Motor Company +# Copyright (c) 2016, Ford Motor Company # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,8 +28,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -if(BUILD_TESTS) -set(TM_TEST_DIR ${COMPONENTS_DIR}/transport_manager/test) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories( include @@ -42,10 +41,16 @@ include_directories( ${JSONCPP_INCLUDE_DIRECTORY} ) +set(EXCLUDE_PATHS + raw_message_matcher.cc +) + +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}") + set(LIBRARIES gmock ConfigProfile - transport_manager + TransportManager Utils ConfigProfile ProtocolLibrary @@ -58,20 +63,12 @@ if (BUILD_USB_SUPPORT) endif() if (BUILD_BT_SUPPORT) + if (CMAKE_SYSTEM_NAME STREQUAL "Linux") list(APPEND LIBRARIES bluetooth) + endif() endif() -set(SOURCES - ${TM_TEST_DIR}/transport_manager_impl_test.cc - ${TM_TEST_DIR}/transport_adapter_test.cc - ${TM_TEST_DIR}/transport_adapter_listener_test.cc - ${TM_TEST_DIR}/tcp_transport_adapter_test.cc - ${TM_TEST_DIR}/tcp_device_test.cc - ${TM_TEST_DIR}/tcp_client_listener_test.cc - ${TM_TEST_DIR}/transport_manager_default_test.cc -) - create_test("transport_manager_test" "${SOURCES}" "${LIBRARIES}") + file(COPY smartDeviceLink_test.ini DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) file(COPY app_info_storage2 DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -endif() diff --git a/src/components/transport_manager/test/raw_message_matcher.cc b/src/components/transport_manager/test/raw_message_matcher.cc index 130ddc96c8..ae43838be9 100644 --- a/src/components/transport_manager/test/raw_message_matcher.cc +++ b/src/components/transport_manager/test/raw_message_matcher.cc @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include "include/raw_message_matcher.h" +#include "include/transport_manager/raw_message_matcher.h" //#include "../../include/protocol/raw_message.h" namespace test { |