diff options
author | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2016-12-30 17:47:39 +0200 |
---|---|---|
committer | Ivo Stoilov (GitHub) <istoilov@luxoft.com> | 2017-01-12 18:36:30 +0200 |
commit | 1c58e66069fe65a94234e322cd76051e0aaa30e2 (patch) | |
tree | c53ae86a4bea52ef5c75f988a4961b8f579229fd /src/components/smart_objects | |
parent | 7063ed619c92d795a46f221fc9935a2249e65bf2 (diff) | |
download | sdl_core-1c58e66069fe65a94234e322cd76051e0aaa30e2.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
Rename src/3rd_party-static/MessageBroker to message_broker
Related tasks APPLINK-30588 APPLINK-30972
Diffstat (limited to 'src/components/smart_objects')
-rw-r--r-- | src/components/smart_objects/CMakeLists.txt | 30 | ||||
-rw-r--r-- | src/components/smart_objects/test/CMakeLists.txt | 27 |
2 files changed, 19 insertions, 38 deletions
diff --git a/src/components/smart_objects/CMakeLists.txt b/src/components/smart_objects/CMakeLists.txt index c1d599db67..339cf90ea4 100644 --- a/src/components/smart_objects/CMakeLists.txt +++ b/src/components/smart_objects/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,28 +28,19 @@ # 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(SMART_OBJECTS_SRC_DIR ${COMPONENTS_DIR}/smart_objects/src) - -include_directories ( - include - ${COMPONENTS_DIR}/utils/include/ +include_directories( + ${COMPONENTS_DIR}/include + ${COMPONENTS_DIR}/smart_objects/include + ${COMPONENTS_DIR}/utils/include ) -set (SOURCES - ${SMART_OBJECTS_SRC_DIR}/smart_object.cc - ${SMART_OBJECTS_SRC_DIR}/smart_schema.cc - ${SMART_OBJECTS_SRC_DIR}/schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/always_false_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/always_true_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/default_shema_item.cc - ${SMART_OBJECTS_SRC_DIR}/bool_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/number_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/enum_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/string_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/object_schema_item.cc - ${SMART_OBJECTS_SRC_DIR}/array_schema_item.cc +set(PATHS + ${CMAKE_CURRENT_SOURCE_DIR}/include + ${CMAKE_CURRENT_SOURCE_DIR}/src ) +collect_sources(SOURCES "${PATHS}") add_library("SmartObjects" ${SOURCES}) @@ -60,4 +51,3 @@ endif() if(BUILD_TESTS) add_subdirectory(test) endif() - diff --git a/src/components/smart_objects/test/CMakeLists.txt b/src/components/smart_objects/test/CMakeLists.txt index e8bc20b6b8..e0cc37e104 100644 --- a/src/components/smart_objects/test/CMakeLists.txt +++ b/src/components/smart_objects/test/CMakeLists.txt @@ -28,8 +28,11 @@ # 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) -add_definitions(-DUNIT_TESTS) + add_definitions(-DUNIT_TESTS) +endif() include_directories ( ${GMOCK_INCLUDE_DIRECTORY} @@ -45,22 +48,10 @@ set(LIBRARIES jsoncpp ) -set(SOURCES - ${COMPONENTS_DIR}/smart_objects/test/SmartObjectDraft_test.cc - ${COMPONENTS_DIR}/smart_objects/test/SmartObjectInvalid_test.cc - ${COMPONENTS_DIR}/smart_objects/test/SmartObjectStress_test.cc - ${COMPONENTS_DIR}/smart_objects/test/SmartObjectUnit_test.cc - ${COMPONENTS_DIR}/smart_objects/test/smart_object_performance_test.cc - ${COMPONENTS_DIR}/smart_objects/test/map_performance_test.cc - ${COMPONENTS_DIR}/smart_objects/test/BoolSchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/NumberSchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/StringSchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/ArraySchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/CObjectSchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/AlwaysTrueSchemaItem_test.cc - ${COMPONENTS_DIR}/smart_objects/test/AlwaysFalseSchemaItem_test.cc +set(EXCLUDE_PATHS + EnumSchemaItem_test.cc + SmartObjectConvertionTime_test.cc ) -create_test("smart_object_test" "${SOURCES}" "${LIBRARIES}") - -endif() +collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" "${EXCLUDE_PATHS}") +create_test(smart_object_test "${SOURCES}" "${LIBRARIES}") |