Cmake mediavision build refactoring

- include -> target_include
- clean pkg_check_modules usage
- remove manual compile option
- remove unused libraries
- remove unused command
- remove arm neon flag
- remove manual prefix

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bb97bb2..fb03cfa 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,6 @@
-cmake_minimum_required(VERSION 2.6)
 set(fw_name "capi-media-vision")
-
 project(${fw_name})
-
-set(CMAKE_INSTALL_PREFIX /usr)
-set(PREFIX ${CMAKE_INSTALL_PREFIX})
+cmake_minimum_required(VERSION 2.6)
 
 set(MV_COMMON_LIB_NAME "mv_common")
 set(MV_BARCODE_DETECTOR_LIB_NAME "mv_barcode_detector" CACHE STRING
@@ -20,75 +16,8 @@ set(MV_SURVEILLANCE_LIB_NAME "mv_surveillance" CACHE STRING
 set(MV_MACHINE_LEARNING_LIB_NAME "mv_machine_learning" CACHE STRING
        "Name of the library will be built for inference module (without extension).")
 
-
-set(INC_DIR "${PROJECT_SOURCE_DIR}/include")
-set(INC_COMMON "${PROJECT_SOURCE_DIR}/mv_common/include")
-
-message(STATUS "In_dir ${INC_DIR}")
-
-set(INC_BARCODE_DETECTOR "${PROJECT_SOURCE_DIR}/mv_barcode/barcode_detector/include")
-set(INC_BARCODE_GENERATOR "${PROJECT_SOURCE_DIR}/mv_barcode/barcode_generator/include")
-set(INC_IMAGE "${PROJECT_SOURCE_DIR}/mv_image/image/include")
-set(INC_FACE "${PROJECT_SOURCE_DIR}/mv_face/face/include")
-set(INC_SURVEILLANCE "${PROJECT_SOURCE_DIR}/mv_surveillance/surveillance/include")
-set(INC_INFERENCE "${PROJECT_SOURCE_DIR}/mv_machine_learning/mv_inference/inference/include")
-
-include_directories(${INC_DIR}
-                    ${INC_COMMON}
-                    ${INC_BARCODE_DETECTOR}
-                    ${INC_BARCODE_GENERATOR}
-                    ${INC_FACE}
-                    ${INC_IMAGE}
-                    ${INC_SURVEILLANCE}
-                    ${INC_INFERENCE})
-
-set(dependents "dlog capi-media-tool capi-system-info")
-set(pc_dependents "capi-media-tool")
-
 include(FindPkgConfig)
-pkg_check_modules(${fw_name} REQUIRED ${dependents})
-foreach(flag ${${fw_name}_CFLAGS})
-    set(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-    set(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-endforeach(flag)
-
-set(TEST_SRC_SUPPORT_ARM_NEON "
-#include <arm_neon.h>
-
-int main (int argc, char **argv) {
-float32x4_t acc = vdupq_n_f32(0.f);
-return 0;
-}
-")
-
-message("arch is ${ARCH}")
-include(CheckCSourceCompiles)
-CHECK_C_SOURCE_COMPILES("${TEST_SRC_SUPPORT_ARM_NEON}" SUPPORT_NEON)
-if(SUPPORT_NEON)
-    add_definitions("-DENABLE_NEON")
-else()
-    set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -mfpu=neon")
-    message("CMAKE_REQUIRED_FLAGS: ${CMAKE_REQUIRED_FLAGS}")
-
-    CHECK_C_SOURCE_COMPILES("${TEST_SRC_SUPPORT_ARM_NEON}" SUPPORT_NEON_)
-    message("Again check SUPPORT_NEON ${SUPPORT_NEON_}")
-    if(SUPPORT_NEON_)
-        add_definitions("-DENABLE_NEON")
-        if("${ARCH}" STREQUAL "arm")
-            set(NEON_CFLAGS "-mfpu=neon")
-            set(NEON_CXXFLAGS "-mfpu=neon")
-        endif()
-    endif()
-endif()
-
-set(CMAKE_C_FLAGS "-I./include -I./include/headers ${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} ${NEON_CFLAGS} -fPIC -Wall")
-set(CMAKE_CXX_FLAGS "-I./include -I./include/headers ${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} ${NEON_CXXFLAGS} -fPIC -Wall")
-
-if("${ARCH}" STREQUAL "arm")
-    add_definitions("-DTARGET")
-endif("${ARCH}" STREQUAL "arm")
-
-add_definitions("-DPREFIX=\"${CMAKE_INSTALL_PREFIX}\"")
+include(GNUInstallDirs)
 
 add_subdirectory(mv_common)
 add_subdirectory(mv_barcode)
@@ -98,7 +27,7 @@ add_subdirectory(mv_surveillance)
 add_subdirectory(mv_machine_learning)
 
 install(
-        DIRECTORY ${INC_DIR}/ DESTINATION include/media
+        DIRECTORY include/ DESTINATION include/media
         FILES_MATCHING
         PATTERN "*_private.h" EXCLUDE
         PATTERN "*.h"
@@ -108,7 +37,6 @@ 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}")
-set(PC_CFLAGS -I\${includedir}/media)
 
 configure_file(
     ${fw_name}.pc.in
@@ -117,6 +45,7 @@ configure_file(
 )
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
+set(pc_dependents "capi-media-tool")
 set(PC_NAME ${fw_name}-common)
 set(PC_REQUIRED ${pc_dependents})
 set(PC_LDFLAGS "-l${MV_COMMON_LIB_NAME}")
@@ -176,35 +105,3 @@ configure_file(
 install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}-inference.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
 add_subdirectory(test)
-
-if(UNIX)
-
-add_custom_target (distclean @echo cleaning for source distribution)
-add_custom_command(
-        DEPENDS clean
-        COMMENT "distribution clean"
-        COMMAND find
-        ARGS    .
-        -not -name config.cmake -and \(
-        -name tester.c -or
-        -name Testing -or
-        -name CMakeFiles -or
-        -name cmake.depends -or
-        -name cmake.check_depends -or
-        -name CMakeCache.txt -or
-        -name cmake.check_cache -or
-        -name *.cmake -or
-        -name Makefile -or
-        -name core -or
-        -name core.* -or
-        -name gmon.out -or
-        -name install_manifest.txt -or
-        -name *.pc -or
-        -name *~ \)
-        | grep -v TC | xargs rm -rf
-        TARGET  distclean
-        VERBATIM
-)
-
-endif(UNIX)
-

diff --git a/mv_barcode/barcode_detector/CMakeLists.txt b/mv_barcode/barcode_detector/CMakeLists.txt
index eed3581..f264d0c 100644 (file)
--- a/mv_barcode/barcode_detector/CMakeLists.txt
+++ b/mv_barcode/barcode_detector/CMakeLists.txt
@@ -1,17 +1,6 @@
 project(${MV_BARCODE_DETECTOR_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${INC_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-file(GLOB MV_BARCODE_DET_INC_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB MV_BARCODE_DET_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                                   "${PROJECT_SOURCE_DIR}/src/*.c")
 
@@ -19,16 +8,14 @@ find_package(OpenCV REQUIRED core imgproc)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
-else()
-    include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_DET_INC_LIST} ${MV_BARCODE_DET_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_DET_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_DET_INC_LIST} ${MV_BARCODE_DET_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_DET_SRC_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} zbar dlog)
-
+target_include_directories(${PROJECT_NAME} PUBLIC 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 439acd2..e8ef678 100644 (file)
--- a/mv_barcode/barcode_generator/CMakeLists.txt
+++ b/mv_barcode/barcode_generator/CMakeLists.txt
@@ -1,29 +1,17 @@
 project(${MV_BARCODE_GENERATOR_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${INC_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-file(GLOB MV_BARCODE_GEN_INC_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB MV_BARCODE_GEN_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                                   "${PROJECT_SOURCE_DIR}/src/*.c")
 
-find_package(OpenCV REQUIRED)
-include_directories(${OpenCV_INCLUDE_DIRS})
+find_package(OpenCV REQUIRED imgcodecs)
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_GEN_INC_LIST} ${MV_BARCODE_GEN_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_GEN_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_GEN_INC_LIST} ${MV_BARCODE_GEN_SRC_LIST})
+    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)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt
index e06833d..4a9f783 100644 (file)
--- a/mv_common/CMakeLists.txt
+++ b/mv_common/CMakeLists.txt
@@ -1,36 +1,23 @@
 project(${MV_COMMON_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${PROJECT_SOURCE_DIR}/include")
-
-file(GLOB MV_COMMON_INCLUDE_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB MV_COMMON_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                              "${PROJECT_SOURCE_DIR}/src/*.c")
 
 find_package(OpenCV REQUIRED core imgproc)
-
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
-else()
-    include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
-pkg_check_modules(JSONGLIB REQUIRED json-glib-1.0)
-include_directories(${JSONGLIB_INCLUDE_DIRS})
+pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED json-glib-1.0 capi-system-info capi-media-tool dlog)
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_COMMON_INCLUDE_LIST} ${MV_COMMON_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_COMMON_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_COMMON_INCLUDE_LIST} ${MV_COMMON_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_COMMON_SRC_LIST})
 endif()
 
-target_link_libraries(${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} capi-system-info capi-media-tool tbm json-glib-1.0)
-
+target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_face/face/CMakeLists.txt b/mv_face/face/CMakeLists.txt
index d16ec46..4c4779f 100644 (file)
--- a/mv_face/face/CMakeLists.txt
+++ b/mv_face/face/CMakeLists.txt
@@ -1,32 +1,20 @@
 project(${MV_FACE_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-file(GLOB MV_FACE_INCLUDE_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 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)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
-else()
-    include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_FACE_INCLUDE_LIST} ${MV_FACE_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_FACE_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_FACE_INCLUDE_LIST} ${MV_FACE_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_FACE_SRC_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} dlog)
-
+target_include_directories(${PROJECT_NAME} PUBLIC include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_image/image/CMakeLists.txt b/mv_image/image/CMakeLists.txt
index ee16bac..e51e9a2 100644 (file)
--- a/mv_image/image/CMakeLists.txt
+++ b/mv_image/image/CMakeLists.txt
@@ -1,32 +1,20 @@
 project(${MV_IMAGE_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-file(GLOB_RECURSE MV_IMAGE_INC_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB_RECURSE MV_IMAGE_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp" "${PROJECT_SOURCE_DIR}/src/*.c")
 
 find_package(OpenCV REQUIRED core imgproc objdetect tracking features2d xfeatures2d)
 if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
-else()
-    include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_INC_LIST} ${MV_IMAGE_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_INC_LIST} ${MV_IMAGE_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_SRC_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS})
-
+target_include_directories(${PROJECT_NAME} PUBLIC include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_machine_learning/mv_inference/inference/CMakeLists.txt b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
index ca14650..5bb56f2 100644 (file)
--- a/mv_machine_learning/mv_inference/inference/CMakeLists.txt
+++ b/mv_machine_learning/mv_inference/inference/CMakeLists.txt
@@ -1,44 +1,21 @@
 project(mv_inference)
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${INC_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-set(dependents "inference-engine-interface-common iniparser json-glib-1.0")
-include(FindPkgConfig)
-pkg_check_modules(${fw_name} REQUIRED ${dependents})
-foreach(flag ${${fw_name}_CFLAGS})
-    set(EXTRA_CFLAGS "${EXTRA_CFLAGS} ${flag}")
-    set(EXTRA_CXXFLAGS "${EXTRA_CXXFLAGS} ${flag}")
-endforeach(flag)
-
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CXXFLAGS} -Wno-unused-parameter -Wno-sign-compare")
-file(GLOB MV_INFERENCE_INCLUDE_LIST "${PROJECT_SOURCE_DIR}/include/*.h" "${PROJECT_SOURCE_DIR}/include/*.hpp")
+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)
 if(NOT OpenCV_FOUND)
        message(SEND_ERROR "OpenCV NOT FOUND")
        return()
-else()
-       include_directories(${OpenCV_INCLUDE_DIRS})
 endif()
 
-
 if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_INFERENCE_INCLUDE_LIST} ${MV_INFERENCE_SOURCE_LIST})
+       add_library(${PROJECT_NAME} STATIC ${MV_INFERENCE_SOURCE_LIST})
 else()
-       add_library(${PROJECT_NAME} SHARED ${MV_INFERENCE_INCLUDE_LIST} ${MV_INFERENCE_SOURCE_LIST})
+       add_library(${PROJECT_NAME} SHARED ${MV_INFERENCE_SOURCE_LIST})
 endif()
 
-target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} inference-engine-interface-common dlog iniparser json-glib-1.0)
-
+target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
+target_include_directories(${PROJECT_NAME} PUBLIC include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_surveillance/surveillance/CMakeLists.txt b/mv_surveillance/surveillance/CMakeLists.txt
index 482772c..d88f144 100644 (file)
--- a/mv_surveillance/surveillance/CMakeLists.txt
+++ b/mv_surveillance/surveillance/CMakeLists.txt
@@ -1,26 +1,15 @@
 project(${MV_SURVEILLANCE_LIB_NAME})
 cmake_minimum_required(VERSION 2.6)
 
-set_property(DIRECTORY APPEND PROPERTY COMPILE_DEFINITIONS_DEBUG _DEBUG)
-
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${LIB_INSTALL_DIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-
-include_directories("${INC_DIR}")
-include_directories("${PROJECT_SOURCE_DIR}/include")
-include_directories("${PROJECT_SOURCE_DIR}/src")
-
-file(GLOB MV_SURVEILLANCE_INC_LIST "${PROJECT_SOURCE_DIR}/include/*.h")
 file(GLOB MV_SURVEILLANCE_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
                                    "${PROJECT_SOURCE_DIR}/src/*.c")
 
 if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_SURVEILLANCE_INC_LIST} ${MV_SURVEILLANCE_SRC_LIST})
+    add_library(${PROJECT_NAME} STATIC ${MV_SURVEILLANCE_SRC_LIST})
 else()
-    add_library(${PROJECT_NAME} SHARED ${MV_SURVEILLANCE_INC_LIST} ${MV_SURVEILLANCE_SRC_LIST})
+    add_library(${PROJECT_NAME} SHARED ${MV_SURVEILLANCE_SRC_LIST})
 endif()
 
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${MV_FACE_LIB_NAME})
-
+target_include_directories(${PROJECT_NAME} PUBLIC include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/packaging/capi-media-vision.spec b/packaging/capi-media-vision.spec
index 7b6bd50..00f7807 100644 (file)
--- a/packaging/capi-media-vision.spec
+++ b/packaging/capi-media-vision.spec
@@ -1,7 +1,7 @@
 Name:        capi-media-vision
 Summary:     Media Vision library for Tizen Native API
-Version:     0.8.0
-Release:     4
+Version:     0.8.1
+Release:     0
 Group:       Multimedia/Framework
 License:     Apache-2.0 and BSD-3-Clause
 Source0:     %{name}-%{version}.tar.gz
@@ -197,11 +197,7 @@ export FFLAGS+=" -fprofile-arcs -ftest-coverage"
 export LDFLAGS+=" -lgcov"
 %endif
 
-MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
-%cmake . -DFULLVER=%{version} -DMAJORVER=${MAJORVER} -DTZ_SYS_BIN=%TZ_SYS_BIN \
-%ifarch %arm
-    -DARCH=arm
-%endif
+%cmake .
 
 make %{?jobs:-j%jobs}
 
@@ -292,7 +288,7 @@ install -m 0644 gcov-obj/* %{buildroot}%{_datadir}/gcov/obj
 %license LICENSE.APLv2
 %{_libdir}/libmv_*helper.so
 %{_libdir}/libmv_testsuite*.so
-%TZ_SYS_BIN/mv_*
+%{_bindir}/mv_*
 
 %if 0%{?gcov:1}
 %files gcov

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4d4cad1..e8822a8 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -1,6 +1,2 @@
-cmake_minimum_required(VERSION 2.6)
-
-set(testbin_dir ${TZ_SYS_BIN})
-
-add_subdirectory(${PROJECT_SOURCE_DIR}/test/assessment)
-add_subdirectory(${PROJECT_SOURCE_DIR}/test/testsuites)
+add_subdirectory(assessment)
+add_subdirectory(testsuites)

diff --git a/test/assessment/barcode/CMakeLists.txt b/test/assessment/barcode/CMakeLists.txt
index 83be8f7..fbcb2dc 100644 (file)
--- a/test/assessment/barcode/CMakeLists.txt
+++ b/test/assessment/barcode/CMakeLists.txt
@@ -7,4 +7,4 @@ target_link_libraries(${PROJECT_NAME} ${MV_BARCODE_DETECTOR_LIB_NAME}
                                       dlog
                                       )
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/assessment/face/CMakeLists.txt b/test/assessment/face/CMakeLists.txt
index 1b653b1..cf203b9 100644 (file)
--- a/test/assessment/face/CMakeLists.txt
+++ b/test/assessment/face/CMakeLists.txt
@@ -14,4 +14,4 @@ target_link_libraries(${PROJECT_NAME}
                     mv_common
                     dlog)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/assessment/surveillance/CMakeLists.txt b/test/assessment/surveillance/CMakeLists.txt
index 510f0f9..c7a30bd 100644 (file)
--- a/test/assessment/surveillance/CMakeLists.txt
+++ b/test/assessment/surveillance/CMakeLists.txt
@@ -13,4 +13,4 @@ target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES}
                                     mv_common
                                     dlog)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/testsuites/barcode/CMakeLists.txt b/test/testsuites/barcode/CMakeLists.txt
index e9d21a7..fb86885 100644 (file)
--- a/test/testsuites/barcode/CMakeLists.txt
+++ b/test/testsuites/barcode/CMakeLists.txt
@@ -10,5 +10,5 @@ ${MV_BARCODE_GENERATOR_LIB_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES}
 avcodec avformat avutil swscale mv_image_helper
 )
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
-install(FILES mv_barcode_test_suite_auto PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})
+install(FILES mv_barcode_test_suite_auto PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/testsuites/common/image_helper/CMakeLists.txt b/test/testsuites/common/image_helper/CMakeLists.txt
index ef9cc67..e96a744 100644 (file)
--- a/test/testsuites/common/image_helper/CMakeLists.txt
+++ b/test/testsuites/common/image_helper/CMakeLists.txt
@@ -10,6 +10,7 @@ if(NOT OpenCV_FOUND)
     message(SEND_ERROR "Failed to find OpenCV")
     return()
 endif()
+pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED capi-media-tool dlog)
 
 if(FORCED_STATIC_BUILD)
     add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_HELPER_SRC_LIST})
@@ -17,7 +18,6 @@ else()
     add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_SRC_LIST})
 endif()
 
-target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include ${OpenCV_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PUBLIC include ${OpenCV_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS})
-
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/test/testsuites/common/video_helper/CMakeLists.txt b/test/testsuites/common/video_helper/CMakeLists.txt
index 2dc8cd5..22296ee 100644 (file)
--- a/test/testsuites/common/video_helper/CMakeLists.txt
+++ b/test/testsuites/common/video_helper/CMakeLists.txt
@@ -1,10 +1,9 @@
 project(mv_video_helper)
 cmake_minimum_required(VERSION 2.6)
 
-pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED gstreamer-1.0 gstreamer-app-1.0 gstreamer-video-1.0 dlog)
+pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED gstreamer-1.0 gstreamer-app-1.0 gstreamer-video-1.0 capi-media-tool dlog)
 
 add_library(${PROJECT_NAME} SHARED mv_video_helper.c)
 target_link_libraries(${PROJECT_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES})
-target_include_directories(${PROJECT_NAME} PUBLIC ${INC_IMAGE_HELPER} ${${PROJECT_NAME}_DEP_INCLUDE_DIRS})
-
+target_include_directories(${PROJECT_NAME} PUBLIC ${INC_IMAGE_HELPER} ${${PROJECT_NAME}_DEP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/test/testsuites/face/CMakeLists.txt b/test/testsuites/face/CMakeLists.txt
index 171fb60..ce57d1d 100644 (file)
--- a/test/testsuites/face/CMakeLists.txt
+++ b/test/testsuites/face/CMakeLists.txt
@@ -9,4 +9,4 @@ target_link_libraries(${PROJECT_NAME} ${MV_FACE_LIB_NAME}
                                       mv_video_helper
                                       mv_testsuite_common)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/testsuites/image/CMakeLists.txt b/test/testsuites/image/CMakeLists.txt
index f33d651..aa2ecfd 100644 (file)
--- a/test/testsuites/image/CMakeLists.txt
+++ b/test/testsuites/image/CMakeLists.txt
@@ -16,4 +16,4 @@ target_link_libraries(${PROJECT_NAME} ${MV_IMAGE_LIB_NAME}
                                       mv_video_helper
                                       mv_testsuite_common)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/testsuites/machine_learning/inference/CMakeLists.txt b/test/testsuites/machine_learning/inference/CMakeLists.txt
index 0c4746d..cd480a7 100644 (file)
--- a/test/testsuites/machine_learning/inference/CMakeLists.txt
+++ b/test/testsuites/machine_learning/inference/CMakeLists.txt
@@ -8,4 +8,4 @@ target_link_libraries(${PROJECT_NAME} mv_inference
                                       mv_video_helper
                                       mv_testsuite_common)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})

diff --git a/test/testsuites/surveillance/CMakeLists.txt b/test/testsuites/surveillance/CMakeLists.txt
index 2034144..d87d645 100644 (file)
--- a/test/testsuites/surveillance/CMakeLists.txt
+++ b/test/testsuites/surveillance/CMakeLists.txt
@@ -7,4 +7,4 @@ target_link_libraries(${PROJECT_NAME} ${MV_SURVEILLANCE_LIB_NAME}
                                       mv_testsuite_common
                                       mv_image_helper)
 
-install(TARGETS ${PROJECT_NAME} DESTINATION ${testbin_dir})
+install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR})