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

2 files changed, 19 insertions, 19 deletions

diff --git a/src/components/dbus/CMakeLists.txt b/src/components/dbus/CMakeLists.txt
index 7e7f2af787..cb1ce30a6d 100644
--- a/src/components/dbus/CMakeLists.txt
+++ b/src/components/dbus/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,6 +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)
 
 include_directories (
   ${DBUS_INCLUDE_DIRS}
@@ -40,17 +41,17 @@ include_directories (
   ${CMAKE_BINARY_DIR}/src/components/
 )
 
-set (SOURCES
+set(PATHS
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
   ${CMAKE_CURRENT_BINARY_DIR}/introspection_xml.cc
   ${CMAKE_CURRENT_BINARY_DIR}/message_descriptions.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/dbus_adapter.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/dbus_message.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/dbus_message_controller.cc
-  ${CMAKE_CURRENT_SOURCE_DIR}/src/schema.cc
 )
+collect_sources(SOURCES "${PATHS}")
 
-set (LIBRARIES dbus-1 -L${DBUS_LIBS_DIRECTORY})
-
+set(LIBRARIES
+  dbus-1 -L${DBUS_LIBS_DIRECTORY}
+)
 
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/message_descriptions.cc
@@ -71,7 +72,7 @@ add_custom_command(
 )
 
 add_library("DBus" ${SOURCES})
-ADD_DEPENDENCIES("DBus" Utils install-3rd_party_dbus)
+add_dependecnies("DBus" Utils install-3rd_party_dbus)
 
 target_link_libraries("DBus" "${LIBRARIES}")
 
diff --git a/src/components/dbus/test/CMakeLists.txt b/src/components/dbus/test/CMakeLists.txt
index d96f2388fb..1b3df2c0e7 100644
--- a/src/components/dbus/test/CMakeLists.txt
+++ b/src/components/dbus/test/CMakeLists.txt
@@ -28,13 +28,20 @@
 # 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 (
   ${GMOCK_INCLUDE_DIRECTORY}
   ${COMPONENTS_DIR}/dbus/include/
 )
 
+#FIXME: exclude some tests
+set (EXCLUDE_PATHS
+	test_dbus_message_controller.cc
+)
+
+collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}" ${EXCLUDE_PATHS})
+
 set (LIBRARIES
     gmock
     DBus
@@ -42,12 +49,4 @@ set (LIBRARIES
     SmartObjects
 )
 
-set(testSources
-    ${COMPONENTS_DIR}/dbus/test/test_schema.cc
-    ${COMPONENTS_DIR}/dbus/test/test_dbus_adapter.cc
-)
-
-create_test("test_DBus_test" "${testSources}" "${LIBRARIES}")
-
-endif()
-
+create_test(test_DBus_test "${SOURCES}" "${LIBRARIES}")