diff options
| author | Alex Kutsan <akutsan@luxoft.com> | 2017-01-27 16:28:34 +0200 |
|---|---|---|
| committer | Alex Kutsan <akutsan@luxoft.com> | 2017-01-27 16:28:34 +0200 |
| commit | 6b408ccced65e5bc7ce0d911cc4884223eaeac56 (patch) | |
| tree | c3495a73ec8a16f681433448023f43b0e973334a /src/components/telemetry_monitor | |
| parent | 6cc4475f1300dfd351d3b203d9881fa6fe6e4ee1 (diff) | |
| parent | 55d7b3429d974e9e4d945920a93cdec02f2dcb06 (diff) | |
| download | sdl_core-6b408ccced65e5bc7ce0d911cc4884223eaeac56.tar.gz | |
Merge release to develop
Diffstat (limited to 'src/components/telemetry_monitor')
| -rw-r--r-- | src/components/telemetry_monitor/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/components/telemetry_monitor/test/CMakeLists.txt | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index 8e55c338f0..69b8371929 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -31,13 +31,16 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories ( + include/ + ${COMPONENTS_DIR}/include/application_manager/ ${COMPONENTS_DIR}/telemetry_monitor/include/ ${COMPONENTS_DIR}/utils/include/ ${COMPONENTS_DIR}/protocol_handler/include/ ${COMPONENTS_DIR}/connection_handler/include/ ${COMPONENTS_DIR}/transport_manager/include/ ${COMPONENTS_DIR}/application_manager/include/ - ${COMPONENTS_DIR}/policy/include/ + ${POLICY_PATH}/include/ + ${POLICY_GLOBAL_INCLUDE_PATH}/ ${COMPONENTS_DIR}/hmi_message_handler/include/ ${COMPONENTS_DIR}/formatters/include/ ${COMPONENTS_DIR}/media_manager/include/ diff --git a/src/components/telemetry_monitor/test/CMakeLists.txt b/src/components/telemetry_monitor/test/CMakeLists.txt index 107a92d614..d72b89f0e1 100644 --- a/src/components/telemetry_monitor/test/CMakeLists.txt +++ b/src/components/telemetry_monitor/test/CMakeLists.txt @@ -41,7 +41,7 @@ include_directories( ${JSONCPP_INCLUDE_DIRECTORY} ) -collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") set(LIBRARIES gmock |