diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2017-06-12 17:40:11 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-12 17:40:11 -0400 |
| commit | c9a24c7c20c66e8d58fbcd72739c949ed004df04 (patch) | |
| tree | 8d40d0e2922a918c402a701833a4c9d11c2093c8 | |
| parent | 817052ffe35991d6927e9176528821323b4e6812 (diff) | |
| download | sdl_core-fix/EXTENDED_MEDIA_MODE_build.tar.gz | |
Fix broken EXTENDED_MEDIA_MODE buildfix/EXTENDED_MEDIA_MODE_build
During CMake refactoring, the necessary include directories for gstreamer were removed from the list for the main executable. This resulted in an build error during the `make` step where the gstreamer headers could not be found. These changes fix this issue.
| -rw-r--r-- | src/appMain/CMakeLists.txt | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt index de81a0b07e..e5f85f7a46 100644 --- a/src/appMain/CMakeLists.txt +++ b/src/appMain/CMakeLists.txt @@ -32,6 +32,15 @@ include(${CMAKE_SOURCE_DIR}/tools/cmake/helpers/sources.cmake) find_package(SDLOpenSSL REQUIRED) +if (EXTENDED_MEDIA_MODE) + set(default_media_inc + ${GSTREAMER_gst_INCLUDE_DIR} + ${GSTREAMER_gstconfig_INCLUDE_DIR} + ) +else(EXTENDED_MEDIA_MODE) + set(default_media_inc) +endif() + include_directories( ${COMPONENTS_DIR}/protocol_handler/include ${COMPONENTS_DIR}/application_manager/include @@ -56,6 +65,7 @@ include_directories( ${JSONCPP_INCLUDE_DIRECTORY} ${LOG4CXX_INCLUDE_DIRECTORY} ${OPENSSL_INCLUDE_DIRECTORY} + ${default_media_inc} ${MESSAGE_BROKER_INCLUDE_DIRECTORY} ) @@ -75,15 +85,6 @@ cmake_policy(SET CMP0015 NEW) link_directories(${LIBUSB_LIBS_DIRECTORY}) 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) -endif() - if (TELEMETRY_MONITOR) set(TELEMETRY_MONITOR_LIB TelemetryMonitor |