diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2016-12-30 17:47:39 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2016-12-30 17:47:39 +0200 |
commit | 16a403b3cca43e4b211525f4b6c80a43466b5e97 (patch) | |
tree | 52c905b3f4afa687996156c965c0cb641fa3c153 /src/components/telemetry_monitor | |
parent | 7d29edc6716188776d4a5668d7960dc58724f611 (diff) | |
download | sdl_core-16a403b3cca43e4b211525f4b6c80a43466b5e97.tar.gz |
Refactor CMake files
Merge components refactoring from Windows port barnch
- add cmake tools
- refactor protocol handler CMakeLists.txt file
- refactor interfaces CMakeLists.txt file
- refactor smart object CMakeLists.txt file
- refactor formatters CMakeLists.txt file
- refactor config profile CMakeLists.txt file
- refactor policy CMakeLists.txt file
- refactor resumption CMakeLists.txt file
- refactor connection handler CMakeLists.txt file
- refactor application manager CMakeLists.txt file
- refactor security manager CMakeLists.txt file
- refactor dbus CMakeLists.txt file
- refactor hmi message handler CMakeLists.txt file
- refactor transport manager CMakeLists.txt file
- refactor utils CMakeLists.txt file
- refactor components root CMakeLists.txt file
- refactor utils CMakeLists.txt file
- refactor components root CMakeLists.txt file
- refactor media manager CMakeLists.txt file
- refactor telemetry monitor CMakeLists.txt file
- refactor appmain CMakeLists.txt file
- refactor plugins CMakeLists.txt file
- refactor 3rd party CMakeLists.txt files
- create cmake helper for interface generation
- refactor root CMakeLists.txt file
Move cmake modules to tools
Related taks APPLINK-30588 APPLINK-30972
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, 17 insertions, 28 deletions
diff --git a/src/components/telemetry_monitor/CMakeLists.txt b/src/components/telemetry_monitor/CMakeLists.txt index f3004dc61e..594b56abc5 100644 --- a/src/components/telemetry_monitor/CMakeLists.txt +++ b/src/components/telemetry_monitor/CMakeLists.txt @@ -28,8 +28,7 @@ # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. - -set(TELEMETRY_MONITOR_SRC_DIR ${COMPONENTS_DIR}/telemetry_monitor/src) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories ( include @@ -49,15 +48,15 @@ include_directories ( ${LOG4CXX_INCLUDE_DIRECTORY} ) -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 +set(PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src +) +collect_sources(SOURCES "${PATHS}") + +set(LIBRARIES + HMI_API + MOBILE_API ) add_library("TelemetryMonitor" ${SOURCES}) diff --git a/src/components/telemetry_monitor/test/CMakeLists.txt b/src/components/telemetry_monitor/test/CMakeLists.txt index 7d2de19854..ea2698dfb2 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. -if(BUILD_TESTS) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories( include @@ -40,20 +40,10 @@ include_directories( ${COMPONENTS_DIR}/resumption/include ${JSONCPP_INCLUDE_DIRECTORY} ) - -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 -) +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}") -set(testLibraries +set(LIBRARIES gmock TelemetryMonitor jsoncpp @@ -68,7 +58,7 @@ set(testLibraries MessageHelper Resumption jsoncpp - transport_manager + TransportManager MediaManager ProtocolHandler connectionHandler @@ -82,8 +72,8 @@ if (BUILD_BT_SUPPORT) list(APPEND testLibraries bluetooth) endif() -file(COPY log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) +create_test("telemetry_monitor_test" "${SOURCES}" "${LIBRARIES}") + +file(COPY ${COMPONENTS_DIR}/telemetry_monitor/test/log4cxx.properties DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) -create_test("telemetry_monitor_test" "${testSources}" "${testLibraries}") -endif() |