diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-10-12 09:28:30 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-10-12 09:28:30 -0400 |
| commit | f66ea1daedf14e932a1d76f91d66bd775b6a1309 (patch) | |
| tree | 7e3468c86b9c4beb57b99392c63d1130afd30c55 | |
| parent | 721aff8d659a95c3bb53a6d9761b8d84fd6036f2 (diff) | |
| download | sdl_core-f66ea1daedf14e932a1d76f91d66bd775b6a1309.tar.gz | |
Fixed build errors when compiling with EXTENDED_MEDIA_MODE=ON
The GStreamer include directories were not properly set up in the CMake files for appMain and the Media Manager component, this commit fixes this.
| -rw-r--r-- | src/appMain/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/components/media_manager/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt index debcfe66c2..84b2c847bd 100644 --- a/src/appMain/CMakeLists.txt +++ b/src/appMain/CMakeLists.txt @@ -45,6 +45,7 @@ cmake_policy(POP) if (EXTENDED_MEDIA_MODE) set(default_media_inc ${GSTREAMER_gst_INCLUDE_DIR} +${GSTREAMER_gstconfig_INCLUDE_DIR} ) else(EXTENDED_MEDIA_MODE) set(default_media_inc diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt index 69af6e7841..3ca02357ab 100644 --- a/src/components/media_manager/CMakeLists.txt +++ b/src/components/media_manager/CMakeLists.txt @@ -37,6 +37,7 @@ 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 @@ -63,6 +64,8 @@ set(LIBRARIES glib-2.0 ) else(EXTENDED_MEDIA_MODE) +set(default_includes +) set(default_sources ${COMPONENTS_DIR}/media_manager/src/audio/socket_audio_streamer_adapter.cc @@ -96,6 +99,7 @@ include_directories ( ${JSONCPP_INCLUDE_DIRECTORY} ${CMAKE_BINARY_DIR}/src/components/ ${COMPONENTS_DIR}/policy/include/ + ${default_includes} ${LOG4CXX_INCLUDE_DIRECTORY} ) |