Cmake: Fix wrong dependency

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

diff --git a/mv_machine_learning/CMakeLists.txt b/mv_machine_learning/CMakeLists.txt
index 531ca29..e9b8ad5 100644 (file)
--- a/mv_machine_learning/CMakeLists.txt
+++ b/mv_machine_learning/CMakeLists.txt
@@ -1,5 +1,5 @@
-add_subdirectory(inference)
 add_subdirectory(common)
+add_subdirectory(inference)
 
 if (${ENABLE_ML_IMAGE_CLASSIFICATION})
     message("Enabled machine learning image classification task group.")

diff --git a/mv_machine_learning/common/CMakeLists.txt b/mv_machine_learning/common/CMakeLists.txt
index ba81c4e..63cbb1a 100644 (file)
--- a/mv_machine_learning/common/CMakeLists.txt
+++ b/mv_machine_learning/common/CMakeLists.txt
@@ -3,11 +3,9 @@ cmake_minimum_required(VERSION 3.13)
 
 file(GLOB MV_ML_SOURCE_LIST  "${PROJECT_SOURCE_DIR}/src/*.cpp" "${PROJECT_SOURCE_DIR}/meta/src/*.cpp")
 
-pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED capi-appfw-app-common)
 add_library(${PROJECT_NAME} SHARED ${MV_ML_SOURCE_LIST})
-target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${${PROJECT_NAME}_DEP_LIBRARIES})
+target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME})
 target_include_directories(${PROJECT_NAME} PRIVATE include meta/include ../../include)
-target_include_directories(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_DEP_INCLUDE_DIRS})
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 install(
     FILES ${PROJECT_SOURCE_DIR}/include/MvMlException.h

diff --git a/mv_machine_learning/face_recognition/CMakeLists.txt b/mv_machine_learning/face_recognition/CMakeLists.txt
index 0739fad..cfbaf6d 100644 (file)
--- a/mv_machine_learning/face_recognition/CMakeLists.txt
+++ b/mv_machine_learning/face_recognition/CMakeLists.txt
@@ -1,7 +1,8 @@
 project(${MV_FACE_RECOG_LIB_NAME})
 cmake_minimum_required(VERSION 3.13)
 
-pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED inference-engine-interface-common training-engine-interface-common)
+pkg_check_modules(${PROJECT_NAME}_DEP REQUIRED inference-engine-interface-common training-engine-interface-common
+    capi-appfw-app-common)
 file(GLOB MV_FACE_RECOG_SOURCE_LIST  "${PROJECT_SOURCE_DIR}/src/*.c" "${PROJECT_SOURCE_DIR}/src/*.cpp")
 
 find_package(OpenCV REQUIRED dnn imgproc)
@@ -13,6 +14,7 @@ endif()
 add_library(${PROJECT_NAME} SHARED ${MV_FACE_RECOG_SOURCE_LIST})
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_ml_common mv_inference mv_training)
 target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../training/include ../common/include ../common/meta/include)
+target_include_directories(${PROJECT_NAME} PUBLIC ${${PROJECT_NAME}_DEP_INCLUDE_DIRS})
 target_compile_definitions(${PROJECT_NAME} PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}")
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 install(