Cmake mediavision build refactoring

- build type to RelWithDebInfo mode
- fix wrong naming(machine_learning -> inference)
- public to private include
- remove unused project
- remove unused libraries

Change-Id: Iab2866be23830c0a8d3e3296e921572fa548c108
Signed-off-by: Kwang Son <k.son@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb03cfa..5370a23 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ set(MV_FACE_LIB_NAME "mv_face" CACHE STRING
        "Name of the library will be built for barcode generating module (without extension).")
 set(MV_SURVEILLANCE_LIB_NAME "mv_surveillance" CACHE STRING
        "Name of the library will be built for surveillance module (without extension).")
-set(MV_MACHINE_LEARNING_LIB_NAME "mv_machine_learning" CACHE STRING
+set(MV_INFERENCE_LIB_NAME "mv_inference" CACHE STRING
        "Name of the library will be built for inference module (without extension).")
 
 include(FindPkgConfig)
@@ -25,6 +25,7 @@ add_subdirectory(mv_image)
 add_subdirectory(mv_face)
 add_subdirectory(mv_surveillance)
 add_subdirectory(mv_machine_learning)
+add_subdirectory(test)
 
 install(
         DIRECTORY include/ DESTINATION include/media
@@ -36,7 +37,7 @@ install(
 set(PC_NAME ${fw_name})
 set(PC_REQUIRED "${fw_name}-barcode ${fw_name}-face ${fw_name}-image ${fw_name}-surveillance ${fw_name}-inference")
 set(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME} -l${MV_BARCODE_DETECTOR_LIB_NAME} -l${MV_BARCODE_GENERATOR_LIB_NAME} \
--l${MV_IMAGE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_SURVEILLANCE_LIB_NAME} -l${MV_MACHINE_LEARNING_LIB_NAME}")
+-l${MV_IMAGE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_SURVEILLANCE_LIB_NAME} -l${MV_INFERENCE_LIB_NAME}")
 
 configure_file(
     ${fw_name}.pc.in
@@ -87,7 +88,7 @@ configure_file(
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-image.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 set(PC_NAME ${fw_name}-surveillance)
-set(PC_LDFLAGS "-l${MV_SURVEILLANCE_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+set(PC_LDFLAGS "-l${MV_SURVEILLANCE_LIB_NAME} -l${MV_FACE_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
 configure_file(
     ${fw_name}.pc.in
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-surveillance.pc
@@ -96,12 +97,10 @@ configure_file(
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-surveillance.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 set(PC_NAME ${fw_name}-inference)
-set(PC_LDFLAGS "-l${MV_MACHINE_LEARNING_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
+set(PC_LDFLAGS "-l${MV_INFERENCE_LIB_NAME} -l${MV_COMMON_LIB_NAME}")
 configure_file(
     ${fw_name}.pc.in
     ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-inference.pc
     @ONLY
 )
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-inference.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-
-add_subdirectory(test)

diff --git a/mv_barcode/CMakeLists.txt b/mv_barcode/CMakeLists.txt
index 2ebefce..7fadf95 100644 (file)
--- a/mv_barcode/CMakeLists.txt
+++ b/mv_barcode/CMakeLists.txt
@@ -1,5 +1,2 @@
-project(mv_barcode)
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/barcode_detector)
-add_subdirectory(${PROJECT_SOURCE_DIR}/barcode_generator)
+add_subdirectory(barcode_detector)
+add_subdirectory(barcode_generator)

diff --git a/mv_barcode/barcode_detector/CMakeLists.txt b/mv_barcode/barcode_detector/CMakeLists.txt
index f264d0c..8840abc 100644 (file)
--- a/mv_barcode/barcode_detector/CMakeLists.txt
+++ b/mv_barcode/barcode_detector/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6)
 file(GLOB MV_BARCODE_DET_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                                   "${PROJECT_SOURCE_DIR}/src/*.c")
 
-find_package(OpenCV REQUIRED core imgproc)
+find_package(OpenCV REQUIRED imgproc)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
@@ -17,5 +17,5 @@ else()
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} zbar dlog)
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_barcode/barcode_generator/CMakeLists.txt b/mv_barcode/barcode_generator/CMakeLists.txt
index e8ef678..ca40696 100644 (file)
--- a/mv_barcode/barcode_generator/CMakeLists.txt
+++ b/mv_barcode/barcode_generator/CMakeLists.txt
@@ -12,6 +12,6 @@ else()
     add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_GEN_SRC_LIST})
 endif()
 
-target_link_libraries(${PROJECT_NAME} zint ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} dlog)
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} zint dlog)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt
index 4a9f783..9fd4d67 100644 (file)
--- a/mv_common/CMakeLists.txt
+++ b/mv_common/CMakeLists.txt
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 2.6)
 file(GLOB MV_COMMON_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                              "${PROJECT_SOURCE_DIR}/src/*.c")
 
-find_package(OpenCV REQUIRED core imgproc)
+find_package(OpenCV REQUIRED imgproc)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()

diff --git a/mv_face/CMakeLists.txt b/mv_face/CMakeLists.txt
index e17c613..180d069 100644 (file)
--- a/mv_face/CMakeLists.txt
+++ b/mv_face/CMakeLists.txt
@@ -1,4 +1 @@
-project(mv_face_port)
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/face)
+add_subdirectory(face)

diff --git a/mv_face/face/CMakeLists.txt b/mv_face/face/CMakeLists.txt
index 4c4779f..74c0dce 100644 (file)
--- a/mv_face/face/CMakeLists.txt
+++ b/mv_face/face/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 2.6)
 
 file(GLOB MV_FACE_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp" "${PROJECT_SOURCE_DIR}/src/*.c")
 
-find_package(OpenCV REQUIRED core objdetect imgproc tracking face)
+find_package(OpenCV REQUIRED imgproc tracking face)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
@@ -16,5 +16,5 @@ else()
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} dlog)
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_machine_learning/CMakeLists.txt b/mv_machine_learning/CMakeLists.txt
index 58d5c0c..8dee930 100644 (file)
--- a/mv_machine_learning/CMakeLists.txt
+++ b/mv_machine_learning/CMakeLists.txt
@@ -1,4 +1 @@
-project(mv_machine_learning)
-cmake_minimum_required(VERSION 2.6)
-
 add_subdirectory(mv_inference)

diff --git a/mv_machine_learning/mv_inference/CMakeLists.txt b/mv_machine_learning/mv_inference/CMakeLists.txt
index d9837d0..37b9e1b 100644 (file)
--- a/mv_machine_learning/mv_inference/CMakeLists.txt
+++ b/mv_machine_learning/mv_inference/CMakeLists.txt
@@ -1,4 +1 @@
-project(mv_inference_port)
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/inference)
+add_subdirectory(inference)

diff --git a/mv_machine_learning/mv_inference/inference/CMakeLists.txt b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
index 5bb56f2..cd20e57 100644 (file)
--- a/mv_machine_learning/mv_inference/inference/CMakeLists.txt
+++ b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
@@ -1,10 +1,10 @@
-project(mv_inference)
+project(${MV_INFERENCE_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
 pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED inference-engine-interface-common iniparser json-glib-1.0)
 file(GLOB MV_INFERENCE_SOURCE_LIST  "${PROJECT_SOURCE_DIR}/src/*.c" "${PROJECT_SOURCE_DIR}/src/*.cpp")
 
-find_package(OpenCV REQUIRED core dnn imgproc)
+find_package(OpenCV REQUIRED dnn imgproc)
 if(NOT OpenCV_FOUND)
        message(SEND_ERROR "OpenCV NOT FOUND")
        return()
@@ -17,5 +17,5 @@ else()
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_surveillance/CMakeLists.txt b/mv_surveillance/CMakeLists.txt
index 61b3ce9..7480953 100644 (file)
--- a/mv_surveillance/CMakeLists.txt
+++ b/mv_surveillance/CMakeLists.txt
@@ -1,4 +1 @@
-project(mv_surveillance_port)
-cmake_minimum_required(VERSION 2.6)
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/surveillance)
+add_subdirectory(surveillance)

diff --git a/mv_surveillance/surveillance/CMakeLists.txt b/mv_surveillance/surveillance/CMakeLists.txt
index d88f144..4b8c191 100644 (file)
--- a/mv_surveillance/surveillance/CMakeLists.txt
+++ b/mv_surveillance/surveillance/CMakeLists.txt
@@ -10,6 +10,10 @@ else()
     add_library(${PROJECT_NAME} SHARED ${MV_SURVEILLANCE_SRC_LIST})
 endif()
 
+if(ENABLE_NEON)
+    target_compile_definitions(${PROJECT_NAME} PUBLIC ENABLE_NEON)
+endif(ENABLE_NEON)
+
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${MV_FACE_LIB_NAME})
-target_include_directories(${PROJECT_NAME} PUBLIC include)
+target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
index f09f39d..1a9077f 100644 (file)
--- a/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
+++ b/mv_surveillance/surveillance/src/EventTriggerPersonAppearance.cpp
@@ -17,7 +17,6 @@
 #include "EventTriggerPersonAppearance.h"
 
 #include "EventManager.h"
-#include "FaceDetector.h"
 #include "SurveillanceHelper.h"
 #include "EventTriggerMovementDetection.h"
 

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 00f7807..17b6db5 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -197,7 +197,10 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov"
 %endif
 
-%cmake .
+%cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifarch %arm aarch64
+-DENABLE_NEON=ON
+%endif
 
 make %{?jobs:-j%jobs}