Revert "Fix/cmake files refactoring"revert-1144-fix/cmake_files_refactoring

2 files changed, 75 insertions, 54 deletions

diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt
index c143a7979e..3ca02357ab 100644
--- a/src/components/media_manager/CMakeLists.txt
+++ b/src/components/media_manager/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (c) 2014-2015, Ford Motor Company
+# Copyright (c) 2014, Ford Motor Company
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,10 +28,63 @@
 # 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/platform.cmake)
-include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake)
 
-include_directories(
+if (EXTENDED_MEDIA_MODE)
+find_package(Gstreamer-1.0 REQUIRED)
+find_package(Glib-2.0 REQUIRED)
+find_package(PkgConfig)
+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
+add_definitions(${GLIB2_CFLAGS})
+set(default_includes
+    ${GSTREAMER_gst_INCLUDE_DIR}
+    ${GSTREAMER_gstconfig_INCLUDE_DIR}
+    ${GLIB_glib_2_INCLUDE_DIR}
+)
+set(default_sources
+    ${COMPONENTS_DIR}/media_manager/src/audio/a2dp_source_player_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/from_mic_recorder_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/from_mic_to_file_recorder_thread.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/file_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/socket_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/pipe_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/file_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/pipe_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/socket_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/file_streamer_adapter.cc
+)
+set(LIBRARIES
+    ${GSTREAMER_gstreamer_LIBRARY}
+    ApplicationManager
+    pulse-simple
+    pulse
+    gobject-2.0
+    glib-2.0
+)
+else(EXTENDED_MEDIA_MODE)
+set(default_includes
+)
+
+set(default_sources
+    ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/file_audio_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/socket_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/pipe_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/video/file_video_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/pipe_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/socket_streamer_adapter.cc
+    ${COMPONENTS_DIR}/media_manager/src/file_streamer_adapter.cc
+)
+set(LIBRARIES
+    ProtocolLibrary
+)
+endif()
+
+include_directories (
     include
     ${COMPONENTS_DIR}/media_manager/include/audio/
     ${COMPONENTS_DIR}/media_manager/include/video/
@@ -46,60 +99,22 @@ include_directories(
     ${JSONCPP_INCLUDE_DIRECTORY}
     ${CMAKE_BINARY_DIR}/src/components/
     ${COMPONENTS_DIR}/policy/include/
+    ${default_includes}
     ${LOG4CXX_INCLUDE_DIRECTORY}
 )
 
-set(PATHS
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
-  ${CMAKE_CURRENT_SOURCE_DIR}/src
+set (SOURCES
+    ${COMPONENTS_DIR}/media_manager/src/media_adapter_impl.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/from_mic_recorder_listener.cc
+    ${COMPONENTS_DIR}/media_manager/src/audio/audio_stream_sender_thread.cc
+    ${COMPONENTS_DIR}/media_manager/src/streamer_listener.cc
+    ${COMPONENTS_DIR}/media_manager/src/media_manager_impl.cc
 )
 
-set(EXCLUDE_PATHS
-  video_stream_to_file_adapter.cc
-)
-
-set(LIBRARIES
-    ProtocolLibrary
-)
-
-if(EXTENDED_MEDIA_MODE)
-  find_package(Gstreamer-1.0 REQUIRED)
-  find_package(Glib-2.0 REQUIRED)
-  find_package(PkgConfig)
-  pkg_check_modules(GLIB2 REQUIRED glib-2.0)
-  add_definitions(${GLIB2_CFLAGS})
-
-  include_directories(
-    ${GSTREAMER_gst_INCLUDE_DIR}
-    ${GSTREAMER_gstconfig_INCLUDE_DIR}
-    ${GLIB_glib_2_INCLUDE_DIR}
-  )
-  list(APPEND EXCLUDE_PATHS
-
-  )
-  list(APPEND LIBRARIES
-    ${GSTREAMER_gstreamer_LIBRARY}
-    pulse-simple
-    pulse
-    gobject-2.0
-    glib-2.0
-  )
-else()
-  list(APPEND EXCLUDE_PATHS
-	a2dp_source_player_adapter.cc
-	from_mic_recorder_adapter.cc
-	from_mic_to_file_recorder_thread.cc
-  )
-endif()
-
-collect_sources(SOURCES "${PATHS}" "${EXCLUDE_PATHS}")
-add_library("MediaManager" ${SOURCES})
+add_library("MediaManager" ${SOURCES} ${default_sources})
 target_link_libraries("MediaManager" ${LIBRARIES})
 
-if(ENABLE_LOG)
-    target_link_libraries("MediaManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
-endif()
-
 if(BUILD_TESTS)
-    add_subdirectory(test)
+  add_subdirectory(test)
 endif()
+
diff --git a/src/components/media_manager/test/CMakeLists.txt b/src/components/media_manager/test/CMakeLists.txt
index f5d596f681..ede6f27f95 100644
--- a/src/components/media_manager/test/CMakeLists.txt
+++ b/src/components/media_manager/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(
     ${GMOCK_INCLUDE_DIRECTORY}
@@ -46,7 +46,9 @@ if(EXTENDED_MEDIA_MODE)
   )
 endif()
 
-collect_sources(SOURCES "${CMAKE_CURRENT_SOURCE_DIR}")
+set(SOURCES
+    ${COMPONENTS_DIR}/media_manager/test/media_manager_impl_test.cc
+)
 
 set(LIBRARIES
     SmartObjects
@@ -72,3 +74,7 @@ create_test("media_manager_test" "${SOURCES}" "${LIBRARIES}")
 if(ENABLE_LOG)
     target_link_libraries("media_manager_test" log4cxx -L${LOG4CXX_LIBS_DIRECTORY})
 endif()
+
+endif()
+
+# vim: set ts=2 sw=2 et: