fix a build error on VD platform

[Version] : 1.0.12
[Issue type] : bug fix

Fix a build error on VD platform. In case of VD platform, gaze tracking
library and relevant test cases shouldn't be compiled. So exclude
the gaze tracking relevant code from build target in case of VD platform.

Change-Id: I749f65c295080b208ff20a48b2319a90750127fa
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7cc4f677b7b352be364d52fda650a1f3be22bc4..f6bb1e6f582178571821ad24c6e1169ea2268297 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,6 +9,7 @@ option(ENABLE_ML_OBJECT_DETECTION "Build ML Object Detection" ON)
 option(ENABLE_ML_OBJECT_DETECTION_3D "Build ML Object Detection 3D" ON)
 option(ENABLE_ML_LANDMARK_DETECTION "Build ML Landmark Detection" ON)
 option(ENABLE_ML_IMAGE_SEGMENTATION "Build ML Image Segmentation" ON)
+option(ENABLE_ML_GAZE_TRACKING "Build ML Gaze Tracking" ON)
 
 option(BUILD_VISUALIZER "Build visualizer for testing 2D/3D output" OFF)
 option(BUILD_CAMERA_PACKET "Build camera packet output test" OFF)
@@ -283,21 +284,23 @@ if (${ENABLE_ML_IMAGE_SEGMENTATION})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
 endif()
 
-set(PC_NAME ${fw_name}-gaze-tracking)
-set(PC_LDFLAGS "-l${MV_GAZE_TRACKING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
-configure_file(
-       ${fw_name}.pc.in
-       ${CMAKE_CURRENT_BINARY_DIR}/${fw_name}-gaze-tracking.pc
-       @ONLY
-)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${fw_name}-gaze-tracking.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-set(GAZE_TRACKING_JSON_FILES
-       "${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/gaze_tracking/meta/gaze_tracking.json"
-       "${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/gaze_tracking/meta/gaze_tracking_plugin.json"
-)
-install(FILES ${GAZE_TRACKING_JSON_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
-list(APPEND TOTAL_REQUIRED ${PC_NAME})
-list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
+if (${ENABLE_ML_GAZE_TRACKING})
+       set(PC_NAME ${fw_name}-gaze-tracking)
+       set(PC_LDFLAGS "-l${MV_GAZE_TRACKING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+       configure_file(
+               ${fw_name}.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/${fw_name}-gaze-tracking.pc
+               @ONLY
+       )
+       install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${fw_name}-gaze-tracking.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+       set(GAZE_TRACKING_JSON_FILES
+               "${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/gaze_tracking/meta/gaze_tracking.json"
+               "${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/gaze_tracking/meta/gaze_tracking_plugin.json"
+       )
+       install(FILES ${GAZE_TRACKING_JSON_FILES} DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
+       list(APPEND TOTAL_REQUIRED ${PC_NAME})
+       list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
+endif()
 
 string(REPLACE ";" " " TOTAL_LDFLAGS "${TOTAL_LDFLAGS}")
 string(REPLACE " " ";" TOTAL_LDFLAGS_LIST "${TOTAL_LDFLAGS}")

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 2366881c6ee487bfea5f12ea693591dcd246235a..2b75d801c8dc0e640492afc101bdfefafa1c8e2e 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,6 +1,6 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
-Version:     1.0.11
+Version:     1.0.12
 Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0
@@ -45,6 +45,7 @@ BuildRequires: pkgconfig(grpc++)
 %if "%{tizen_profile_name}" == "tv"
 %define enable_ml_face_recognition 0
 %define build_depth_stream_testsuite 0
+%define enable_ml_gaze_tracking 0
 %else
 %define enable_ml_face_recognition 1
 BuildRequires: pkgconfig(training-engine-interface-common)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 7870e4e5b93d7162b6795a9aa24c53083ac9c5fa..41973bd1918bfbd2a9d4c9819a0746b5f084222d 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -52,7 +52,9 @@ if (${ENABLE_ML_IMAGE_SEGMENTATION})
   include(testsuites/machine_learning/image_segmentation/CMakeLists.txt)
 endif()
 
-include(testsuites/machine_learning/gaze_tracking/CMakeLists.txt)
+if (${ENABLE_ML_GAZE_TRACKING})
+  include(testsuites/machine_learning/gaze_tracking/CMakeLists.txt)
+endif()
 
 if (${BUILD_DEPTH_STREAM_TESTSUITE})
   set(SRC_FILES ${SRC_FILES} testsuites/mv3d/test_3d.cpp)
@@ -97,7 +99,9 @@ if (${ENABLE_ML_IMAGE_SEGMENTATION})
 target_link_libraries(${PROJECT_NAME} ${MV_IMAGE_SEGMENTATION_LIB_NAME})
 endif()
 
+if (${ENABLE_ML_GAZE_TRACKING})
 target_link_libraries(${PROJECT_NAME} ${MV_GAZE_TRACKING_LIB_NAME})
+endif()
 
 if (${BUILD_DEPTH_STREAM_TESTSUITE})
 target_link_libraries(${PROJECT_NAME} mv_3d)