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/formatters | |
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/formatters')
-rw-r--r-- | src/components/formatters/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/components/formatters/test/CMakeLists.txt | 24 |
2 files changed, 17 insertions, 31 deletions
diff --git a/src/components/formatters/CMakeLists.txt b/src/components/formatters/CMakeLists.txt index 1858342ff3..02a337e278 100644 --- a/src/components/formatters/CMakeLists.txt +++ b/src/components/formatters/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2014, 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. - -set(FORMATTERS_SRC_DIR ${COMPONENTS_DIR}/formatters/src) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories ( include/ @@ -41,22 +40,13 @@ include_directories ( ${COMPONENTS_DIR}/utils/include ) -set (SOURCES - ${FORMATTERS_SRC_DIR}/CSmartFactory.cc -) - -set (FORMATTER_SOURCES - ${FORMATTERS_SRC_DIR}/CFormatterJsonBase.cc - ${FORMATTERS_SRC_DIR}/CFormatterJsonSDLRPCv1.cc - ${FORMATTERS_SRC_DIR}/CFormatterJsonSDLRPCv2.cc - ${FORMATTERS_SRC_DIR}/formatter_json_rpc.cc - ${FORMATTERS_SRC_DIR}/meta_formatter.cc - ${FORMATTERS_SRC_DIR}/generic_json_formatter.cc +set(PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src ) -add_library("formatters" ${SOURCES} - ${FORMATTER_SOURCES} -) +collect_sources(SOURCES "${PATHS}") +add_library(formatters ${SOURCES}) if(BUILD_TESTS) add_subdirectory(test) diff --git a/src/components/formatters/test/CMakeLists.txt b/src/components/formatters/test/CMakeLists.txt index d245626dae..c80c3d0e40 100644 --- a/src/components/formatters/test/CMakeLists.txt +++ b/src/components/formatters/test/CMakeLists.txt @@ -29,7 +29,7 @@ # POSSIBILITY OF SUCH DAMAGE. -if(BUILD_TESTS) +include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) include_directories( ${GMOCK_INCLUDE_DIRECTORY} @@ -49,19 +49,15 @@ set(LIBRARIES jsoncpp ) -set(SOURCES - ${COMPONENTS_DIR}/formatters/test/src/SmartFactoryTestHelper.cc - ${COMPONENTS_DIR}/formatters/test/CSmartFactory_test.cc - ${COMPONENTS_DIR}/formatters/test/CFormatterJsonBase_test.cc - ${COMPONENTS_DIR}/formatters/test/generic_json_formatter_test.cc - ${COMPONENTS_DIR}/formatters/test/formatter_json_rpc_test.cc - ${COMPONENTS_DIR}/formatters/test/src/create_smartSchema.cc - ${COMPONENTS_DIR}/formatters/test/cFormatterJsonSDLRPCv1_test.cc - ${COMPONENTS_DIR}/formatters/test/cFormatterJsonSDLRPCv2_test.cc - ${COMPONENTS_DIR}/formatters/test/src/meta_formatter_test_helper.cc - ${COMPONENTS_DIR}/formatters/test/meta_formatter_test.cc +set (SOURCES + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR} ) -create_test("formatters_test" "${SOURCES}" "${LIBRARIES}") +set (EXCLUDE_PATHS +) + +collect_sources(SOURCES "") +create_test(formatters_test "${SOURCES}" "${LIBRARIES}") -endif() |