diff options
author | Alexander Kutsan (GitHub) <akutsan@luxoft.com> | 2017-01-05 15:18:10 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-05 15:18:10 +0200 |
commit | c0201b2eb983eb963f53fc23266c0e5cfae9f708 (patch) | |
tree | 8b451b5772dd5d3aed43739ef47fb34b857a7628 /src/components/rpc_base | |
parent | 15fc6572395056b43cd6fbf23737048772daa350 (diff) | |
download | sdl_core-c0201b2eb983eb963f53fc23266c0e5cfae9f708.tar.gz |
Revert "Fix/cmake files refactoring"revert-1144-fix/cmake_files_refactoring
Diffstat (limited to 'src/components/rpc_base')
-rw-r--r-- | src/components/rpc_base/CMakeLists.txt | 28 | ||||
-rw-r--r-- | src/components/rpc_base/test/CMakeLists.txt | 31 |
2 files changed, 33 insertions, 26 deletions
diff --git a/src/components/rpc_base/CMakeLists.txt b/src/components/rpc_base/CMakeLists.txt index 700cec72bb..94e67cc985 100644 --- a/src/components/rpc_base/CMakeLists.txt +++ b/src/components/rpc_base/CMakeLists.txt @@ -28,27 +28,31 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) + +set(RPC_BASE_INCLUDE_DIR ${COMPONENTS_DIR}/rpc_base/include) include_directories( - ${COMPONENTS_DIR}/rpc_base/include - ${COMPONENTS_DIR}/utils/include + include ${JSONCPP_INCLUDE_DIRECTORY} ) -set(PATHS - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src +set (SOURCES + ${COMPONENTS_DIR}/rpc_base/src/rpc_base/rpc_base.cc ) -collect_sources(SOURCES "${PATHS}") -set(LIBRARIES - jsoncpp +set (HEADERS + ${RPC_BASE_INCLUDE_DIR}/rpc_base/gtest_support.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/rpc_base_dbus_inl.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/rpc_base.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/rpc_base_inl.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/rpc_base_json_inl.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/rpc_message.h + ${RPC_BASE_INCLUDE_DIR}/rpc_base/validation_report.h ) -add_library(rpc_base ${SOURCES}) -target_link_libraries(rpc_base ${LIBRARIES}) +add_library(rpc_base ${HEADERS} ${SOURCES}) +target_link_libraries(rpc_base jsoncpp) if(BUILD_TESTS) add_subdirectory(test) -endif() +endif()
\ No newline at end of file diff --git a/src/components/rpc_base/test/CMakeLists.txt b/src/components/rpc_base/test/CMakeLists.txt index 566f0ddcde..76cf738f46 100644 --- a/src/components/rpc_base/test/CMakeLists.txt +++ b/src/components/rpc_base/test/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2016, Ford Motor Company +# Copyright (c) 2015, Ford Motor Company # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -28,9 +28,8 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) - -include_directories( +if (BUILD_TESTS) + include_directories ( ${COMPONENTS_DIR}/dbus/include ${COMPONENTS_DIR}/dbus/src ${COMPONENTS_DIR}/rpc_base/include @@ -44,16 +43,20 @@ set(LIBRARIES jsoncpp ) -if(${HMI_DBUS_API}) +set(SOURCES + rpc_base_json_test.cc + rpc_base_test.cc + validation_report_test.cc +) + +if (${HMI_DBUS_API}) + # Build dbus tests include_directories(${DBUS_INCLUDE_DIRS}) - list(APPEND LIBRARIES - DBus - ) -else() - set(EXCLUDE_PATHS - rpc_base_dbus_test.cc - ) + set (LIBRARIES ${LIBRARIES} DBus) + set (SOURCES ${SOURCES} rpc_base_dbus_test.cc) +endif () + +create_test("rpc_base_test" "${SOURCES}" "${LIBRARIES}") + endif() -collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}") -create_test(rpc_base_test "${SOURCES}" "${LIBRARIES}") |