Fix build error 72/62872/1 accepted/tizen/ivi/20160321.115322 submit/tizen_ivi/20160321.073004
authorHurnjoo Lee <hurnjoo.lee@samsung.com>
Wed, 27 Jan 2016 04:25:40 +0000 (13:25 +0900)
committerSuchang Woo <suchang.woo@samsung.com>
Mon, 21 Mar 2016 02:18:21 +0000 (11:18 +0900)
Change-Id: I69ec9dd3d52ca6faa67cc9fafa97c9829d88f037
Signed-off-by: Hurnjoo Lee <hurnjoo.lee@samsung.com>
cmake/Modules/FindGstreamer-1.0.cmake
src/appMain/CMakeLists.txt
src/components/application_manager/CMakeLists.txt
src/components/media_manager/CMakeLists.txt
src/components/time_tester/CMakeLists.txt

index 8f1d69d..b144666 100644 (file)
@@ -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
index f837c44..e02a23c 100644 (file)
@@ -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
index 98b0640..b946dc6 100644 (file)
@@ -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")
+
index 9365019..921d396 100644 (file)
@@ -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})
index 3884199..2ccfb65 100644 (file)
@@ -28,4 +28,5 @@ set (SOURCES
 )
 
 add_library("TimeTester" ${SOURCES})
+add_dependencies("TimeTester" "HMI_API")
 target_link_libraries("TimeTester" ${LIBRARIES})