code clean to build script and spec files

[Issue type] : code clean

Reoarranged build script code in order ofrecently added features and
fixed spec file that only enabled feature test binaries can be tested.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 701ef31..d5f489f 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,30 +142,38 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-inference.pc DESTINATION ${
 list(APPEND TOTAL_REQUIRED ${PC_NAME})
 list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
 
-if (${ENABLE_ML_OBJECT_DETECTION})
-    set(PC_NAME ${fw_name}-object-detection)
-    set(PC_LDFLAGS "-l${MV_OBJECT_DETECTION_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+set(PC_NAME ${fw_name}-tracker)
+set(PC_LDFLAGS "-l${MV_ROI_TRACKER_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+configure_file(
+    ${fw_name}.pc.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-tracker.pc
+    @ONLY
+)
+install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-tracker.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+list(APPEND TOTAL_REQUIRED ${PC_NAME})
+list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
+
+if (${ENABLE_ML_FACE_RECOGNITION})
+    set(PC_NAME ${fw_name}-training)
+    set(PC_LDFLAGS "-l${MV_TRAINING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
     configure_file(
-           ${fw_name}.pc.in
-           ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection.pc
-           @ONLY
+        ${fw_name}.pc.in
+        ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-training.pc
+        @ONLY
     )
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/object_detection/meta/object_detection.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-training.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
        list(APPEND TOTAL_REQUIRED ${PC_NAME})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
-endif()
 
-if (${ENABLE_ML_OBJECT_DETECTION_3D})
-    set(PC_NAME ${fw_name}-object-detection-3d)
-    set(PC_LDFLAGS "-l${MV_OBJECT_DETECTION_3D_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+       set(PC_NAME ${fw_name}-face-recognition)
+    set(PC_LDFLAGS "-l${MV_FACE_RECOG_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
     configure_file(
-           ${fw_name}.pc.in
-           ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection-3d.pc
-           @ONLY
+        ${fw_name}.pc.in
+        ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-face-recognition.pc
+        @ONLY
     )
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection-3d.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/object_detection_3d/meta/object_detection_3d.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-face-recognition.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/face_recognition/meta/face_recognition.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
        list(APPEND TOTAL_REQUIRED ${PC_NAME})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
 endif()
@@ -184,42 +192,34 @@ if (${ENABLE_ML_IMAGE_CLASSIFICATION})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
 endif()
 
-if (${ENABLE_ML_FACE_RECOGNITION})
-    set(PC_NAME ${fw_name}-training)
-    set(PC_LDFLAGS "-l${MV_TRAINING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+if (${ENABLE_ML_OBJECT_DETECTION})
+    set(PC_NAME ${fw_name}-object-detection)
+    set(PC_LDFLAGS "-l${MV_OBJECT_DETECTION_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
     configure_file(
-        ${fw_name}.pc.in
-        ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-training.pc
-        @ONLY
+           ${fw_name}.pc.in
+           ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection.pc
+           @ONLY
     )
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-training.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/object_detection/meta/object_detection.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
        list(APPEND TOTAL_REQUIRED ${PC_NAME})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
+endif()
 
-       set(PC_NAME ${fw_name}-face-recognition)
-    set(PC_LDFLAGS "-l${MV_FACE_RECOG_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+if (${ENABLE_ML_OBJECT_DETECTION_3D})
+    set(PC_NAME ${fw_name}-object-detection-3d)
+    set(PC_LDFLAGS "-l${MV_OBJECT_DETECTION_3D_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
     configure_file(
-        ${fw_name}.pc.in
-        ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-face-recognition.pc
-        @ONLY
+           ${fw_name}.pc.in
+           ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection-3d.pc
+           @ONLY
     )
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-face-recognition.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/face_recognition/meta/face_recognition.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-object-detection-3d.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+    install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/mv_machine_learning/object_detection_3d/meta/object_detection_3d.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${fw_name})
        list(APPEND TOTAL_REQUIRED ${PC_NAME})
        list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
 endif()
 
-set(PC_NAME ${fw_name}-tracker)
-set(PC_LDFLAGS "-l${MV_ROI_TRACKER_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
-configure_file(
-    ${fw_name}.pc.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-tracker.pc
-    @ONLY
-)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-tracker.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-list(APPEND TOTAL_REQUIRED ${PC_NAME})
-list(APPEND TOTAL_LDFLAGS ${PC_LDFLAGS})
-
 string(REPLACE ";" " " TOTAL_LDFLAGS "${TOTAL_LDFLAGS}")
 string(REPLACE " " ";" TOTAL_LDFLAGS_LIST "${TOTAL_LDFLAGS}")
 list(REMOVE_DUPLICATES TOTAL_LDFLAGS_LIST)

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 2b5334a..b1ef58c 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -309,10 +309,18 @@ setup() {
 test_main() {
     echo "test_main start"
     /usr/bin/mv_test
+%if "%{enable_ml_face_recognition}" == "1"
     /usr/bin/test_face_recognition
+%endif
+%if "%{enable_ml_image_classification}" == "1"
     /usr/bin/test_image_classification
+%endif
+%if "%{enable_ml_object_detection}" == "1"
     /usr/bin/test_object_detection
+%endif
+%if "%{enable_ml_object_detection_3d}" == "1"
     /usr/bin/test_object_detection_3d
+%endif
 }
 
 teardown() {
@@ -415,6 +423,15 @@ find . -name '*.gcno' -not -path "./test/*" -exec cp --parents '{}' "$gcno_obj_d
 %manifest %{name}.manifest
 %license LICENSE.APLv2 LICENSE.BSD-3-Clause
 %{_libdir}/libmv_inference*.so
+%if "%{enable_ml_face_recognition}" == "1"
+%{_datadir}/%{name}/face_recognition.json
+%{_libdir}/libmv_training.so
+%{_libdir}/libmv_face_recognition.so
+%endif
+%if "%{enable_ml_image_classification}" == "1"
+%{_datadir}/%{name}/image_classification.json
+%{_libdir}/libmv_image_classification.so
+%endif
 %if "%{enable_ml_object_detection}" == "1"
 %{_datadir}/%{name}/object_detection.json
 %{_libdir}/libmv_object_detection.so
@@ -423,18 +440,20 @@ find . -name '*.gcno' -not -path "./test/*" -exec cp --parents '{}' "$gcno_obj_d
 %{_datadir}/%{name}/object_detection_3d.json
 %{_libdir}/libmv_object_detection_3d.so
 %endif
-%if "%{enable_ml_image_classification}" == "1"
-%{_datadir}/%{name}/image_classification.json
-%{_libdir}/libmv_image_classification.so
-%endif
-%if "%{enable_ml_face_recognition}" == "1"
-%{_datadir}/%{name}/face_recognition.json
-%{_libdir}/libmv_training.so
-%{_libdir}/libmv_face_recognition.so
-%endif
 
 %files machine_learning-devel
 %{_includedir}/media/mv_infer*.h
+%{_libdir}/pkgconfig/*inference.pc
+%if "%{enable_ml_face_recognition}" == "1"
+%{_includedir}/media/mv_face_recognition*.h
+%{_libdir}/pkgconfig/*training.pc
+%{_libdir}/pkgconfig/*face-recognition.pc
+%endif
+%if "%{enable_ml_image_classification}" == "1"
+%{_includedir}/media/mv_image_classification_internal.h
+%{_includedir}/media/mv_image_classification_type.h
+%{_libdir}/pkgconfig/*image-classification.pc
+%endif
 %if "%{enable_ml_object_detection}" == "1"
 %{_includedir}/media/mv_object_detection_internal.h
 %{_includedir}/media/mv_object_detection_type.h
@@ -445,17 +464,6 @@ find . -name '*.gcno' -not -path "./test/*" -exec cp --parents '{}' "$gcno_obj_d
 %{_includedir}/media/mv_object_detection_3d_type.h
 %{_libdir}/pkgconfig/*object-detection-3d.pc
 %endif
-%if "%{enable_ml_image_classification}" == "1"
-%{_includedir}/media/mv_image_classification_internal.h
-%{_includedir}/media/mv_image_classification_type.h
-%{_libdir}/pkgconfig/*image-classification.pc
-%endif
-%{_libdir}/pkgconfig/*inference.pc
-%if "%{enable_ml_face_recognition}" == "1"
-%{_includedir}/media/mv_face_recognition*.h
-%{_libdir}/pkgconfig/*training.pc
-%{_libdir}/pkgconfig/*face-recognition.pc
-%endif
 
 %files roi_tracker
 %manifest %{name}.manifest
@@ -477,6 +485,11 @@ find . -name '*.gcno' -not -path "./test/*" -exec cp --parents '{}' "$gcno_obj_d
 %endif
 %{_libdir}/libmv_testsuite*.so
 %{_bindir}/mv_*
+%if "%{enable_ml_face_recognition}" == "1"
+%{_bindir}/test_face_recognition
+%{_bindir}/test_face_recognition_multi_threads
+%{_bindir}/measure_face_recognition
+%endif
 %if "%{enable_ml_image_classification}" == "1"
 %{_bindir}/test_image_classification
 %endif
@@ -486,11 +499,6 @@ find . -name '*.gcno' -not -path "./test/*" -exec cp --parents '{}' "$gcno_obj_d
 %if "%{enable_ml_object_detection_3d}" == "1"
 %{_bindir}/test_object_detection_3d
 %endif
-%if "%{enable_ml_face_recognition}" == "1"
-%{_bindir}/test_face_recognition
-%{_bindir}/test_face_recognition_multi_threads
-%{_bindir}/measure_face_recognition
-%endif
 %{_bindir}/tizen-unittests/%{name}/run-unittest.sh
 %endif