From 9ec1b03f1a804d2aaa66c44d23152595c486fb2a Mon Sep 17 00:00:00 2001 From: Hurnjoo Lee Date: Wed, 27 Jan 2016 13:25:40 +0900 Subject: [PATCH] Fix build error Change-Id: I69ec9dd3d52ca6faa67cc9fafa97c9829d88f037 Signed-off-by: Hurnjoo Lee --- cmake/Modules/FindGstreamer-1.0.cmake | 2 +- src/appMain/CMakeLists.txt | 1 + src/components/application_manager/CMakeLists.txt | 3 ++- src/components/media_manager/CMakeLists.txt | 2 ++ src/components/time_tester/CMakeLists.txt | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindGstreamer-1.0.cmake b/cmake/Modules/FindGstreamer-1.0.cmake index 8f1d69d..b144666 100644 --- a/cmake/Modules/FindGstreamer-1.0.cmake +++ b/cmake/Modules/FindGstreamer-1.0.cmake @@ -7,7 +7,7 @@ FIND_PATH(GSTREAMER_gst_INCLUDE_DIR gst/gst.h ENV INCLUDE DOC "Directory containing gst/gst.h include file") FIND_PATH(GSTREAMER_gstconfig_INCLUDE_DIR gst/gstconfig.h - PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-1.0 /usr/include/gstreamer-1.0 /usr/local/lib/include/gstreamer-1.0 /usr/lib/include/gstreamer-1.0 + PATHS ${GSTREAMER_DIR}/include ${GSTREAMER_DIR}/lib/include /usr/local/include/gstreamer-1.0 /usr/include/gstreamer-1.0 /usr/local/lib/include/gstreamer-1.0 /usr/lib/include/gstreamer-1.0 /usr/lib/gstreamer-1.0/include ENV INCLUDE DOC "Directory containing gst/gstconfig.h include file") FIND_LIBRARY(GSTREAMER_gstaudio_LIBRARY NAMES gstaudio-1.0 libgstaudio-1.0 diff --git a/src/appMain/CMakeLists.txt b/src/appMain/CMakeLists.txt index f837c44..e02a23c 100644 --- a/src/appMain/CMakeLists.txt +++ b/src/appMain/CMakeLists.txt @@ -15,6 +15,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/application_manager/CMakeLists.txt b/src/components/application_manager/CMakeLists.txt index 98b0640..b946dc6 100644 --- a/src/components/application_manager/CMakeLists.txt +++ b/src/components/application_manager/CMakeLists.txt @@ -2,7 +2,6 @@ if (EXTENDED_POLICY_FLAG) add_definitions(-DEXTENDED_POLICY) endif() - include_directories ( ./include/ ../utils/include/ @@ -422,3 +421,5 @@ if(ENABLE_LOG) add_dependencies("ApplicationManager" liblog4cxx) target_link_libraries("ApplicationManager" log4cxx -L${LOG4CXX_LIBS_DIRECTORY}) endif() +add_dependencies("ApplicationManager" "HMI_API") + diff --git a/src/components/media_manager/CMakeLists.txt b/src/components/media_manager/CMakeLists.txt index 9365019..921d396 100644 --- a/src/components/media_manager/CMakeLists.txt +++ b/src/components/media_manager/CMakeLists.txt @@ -6,6 +6,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 @@ -74,4 +75,5 @@ set (SOURCES ) add_library("MediaManager" ${SOURCES} ${default_sources}) +add_dependencies("MediaManager" "HMI_API") target_link_libraries("MediaManager" ${LIBRARIES}) diff --git a/src/components/time_tester/CMakeLists.txt b/src/components/time_tester/CMakeLists.txt index 3884199..2ccfb65 100644 --- a/src/components/time_tester/CMakeLists.txt +++ b/src/components/time_tester/CMakeLists.txt @@ -28,4 +28,5 @@ set (SOURCES ) add_library("TimeTester" ${SOURCES}) +add_dependencies("TimeTester" "HMI_API") target_link_libraries("TimeTester" ${LIBRARIES}) -- 2.7.4