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/telemetry_monitor | |
| 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/telemetry_monitor')
| -rw-r--r-- | src/components/telemetry_monitor/CMakeLists.txt | 21 | ||||
| -rw-r--r-- | src/components/telemetry_monitor/test/CMakeLists.txt | 24 |
2 files changed, 28 insertions, 17 deletions
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index 594b56abc5..f3004dc61e 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -28,7 +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) + +set(TELEMETRY_MONITOR_SRC_DIR ${COMPONENTS_DIR}/telemetry_monitor/src) include_directories ( include @@ -48,15 +49,15 @@ include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} ) -set(PATHS - ${CMAKE_CURRENT_SOURCE_DIR}/include - ${CMAKE_CURRENT_SOURCE_DIR}/src -) -collect_sources(SOURCES "${PATHS}") - -set(LIBRARIES - HMI_API - MOBILE_API +set(SOURCES + ${TELEMETRY_MONITOR_SRC_DIR}/metric_wrapper.cc + ${TELEMETRY_MONITOR_SRC_DIR}/telemetry_monitor.cc + ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_observer.cc + ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_observer.cc + ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_observer.cc + ${TELEMETRY_MONITOR_SRC_DIR}/application_manager_metric_wrapper.cc + ${TELEMETRY_MONITOR_SRC_DIR}/transport_manager_metric_wrapper.cc + ${TELEMETRY_MONITOR_SRC_DIR}/protocol_handler_metric_wrapper.cc ) add_library("TelemetryMonitor" ${SOURCES}) diff --git a/src/components/telemetry_monitor/test/CMakeLists.txt b/src/components/telemetry_monitor/test/CMakeLists.txt index ea2698dfb2..7d2de19854 100644 --- a/src/components/telemetry_monitor/test/CMakeLists.txt +++ b/src/components/telemetry_monitor/test/CMakeLists.txt @@ -28,7 +28,7 @@ # 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) +if(BUILD_TESTS) include_directories( include @@ -40,10 +40,20 @@ include_directories( ${COMPONENTS_DIR}/resumption/include ${JSONCPP_INCLUDE_DIRECTORY} ) + -collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") +set(testSources + metric_wrapper_test.cc + telemetry_monitor_test.cc + protocol_handler_metric_test.cc + protocol_handler_observer_test.cc + transport_manager_metric_test.cc + transport_manager_observer_test.cc + application_manager_metric_test.cc + application_manager_observer_test.cc +) -set(LIBRARIES +set(testLibraries gmock TelemetryMonitor jsoncpp @@ -58,7 +68,7 @@ set(LIBRARIES MessageHelper Resumption jsoncpp - TransportManager + transport_manager MediaManager ProtocolHandler connectionHandler @@ -72,8 +82,8 @@ if (BUILD_BT_SUPPORT) list(APPEND testLibraries bluetooth) endif() -create_test("telemetry_monitor_test" "${SOURCES}" "${LIBRARIES}") - -file(COPY ${COMPONENTS_DIR}/telemetry_monitor/test/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +create_test("telemetry_monitor_test" "${testSources}" "${testLibraries}") +endif() |