install header files correctly

[Issue type] : code cleanup

Do not install all header files at once but install only header files
that relevant feature is enabled. And move relevant script code to each
feature directory.

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf75b37..701ef31 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,23 +56,6 @@ add_subdirectory(mv_roi_tracker)
 add_subdirectory(test)
 endif()
 
-if(BUILD_ML_ONLY)
-install(
-        DIRECTORY include/ DESTINATION include/media
-        FILES_MATCHING
-        PATTERN "*_private.h" EXCLUDE
-        PATTERN "*_inference*.h"
-        PATTERN "*_common*.h"
-        )
-else()
-install(
-        DIRECTORY include/ DESTINATION include/media
-        FILES_MATCHING
-        PATTERN "*_private.h" EXCLUDE
-        PATTERN "*.h"
-        )
-endif()
-
 set(TOTAL_REQUIRED "")
 set(TOTAL_LDFLAGS "")
 

diff --git a/mv_3d/3d/CMakeLists.txt b/mv_3d/3d/CMakeLists.txt
index 5d2e81a..74646e4 100644 (file)
--- a/mv_3d/3d/CMakeLists.txt
+++ b/mv_3d/3d/CMakeLists.txt
@@ -33,3 +33,10 @@ if(MV_3D_POINTCLOUD_IS_AVAILABLE)
 endif()
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_3d_internal.h"
+        PATTERN "mv_3d_private.h"
+               PATTERN "mv_3d_type.h"
+        )
\ No newline at end of file

diff --git a/mv_barcode/barcode_detector/CMakeLists.txt b/mv_barcode/barcode_detector/CMakeLists.txt
index 7a8a93c..a7eb185 100644 (file)
--- a/mv_barcode/barcode_detector/CMakeLists.txt
+++ b/mv_barcode/barcode_detector/CMakeLists.txt
@@ -20,3 +20,11 @@ target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} zbar
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_barcode_generate.h"
+        PATTERN "mv_barcode_detect.h"
+               PATTERN "mv_barcode_type.h"
+               PATTERN "mv_barcode.h"
+        )
\ No newline at end of file

diff --git a/mv_barcode/barcode_generator/CMakeLists.txt b/mv_barcode/barcode_generator/CMakeLists.txt
index 3091ca9..3a822d8 100644 (file)
--- a/mv_barcode/barcode_generator/CMakeLists.txt
+++ b/mv_barcode/barcode_generator/CMakeLists.txt
@@ -16,3 +16,8 @@ target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} zint
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_barcode_generate.h"
+        )
\ No newline at end of file

diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt
index 6434960..3fae4ea 100644 (file)
--- a/mv_common/CMakeLists.txt
+++ b/mv_common/CMakeLists.txt
@@ -22,3 +22,8 @@ target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRA
 target_include_directories(${PROJECT_NAME} PUBLIC include ${${PROJECT_NAME}_DEP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_common.h"
+        )

diff --git a/mv_face/face/CMakeLists.txt b/mv_face/face/CMakeLists.txt
index afad25a..7e05d57 100644 (file)
--- a/mv_face/face/CMakeLists.txt
+++ b/mv_face/face/CMakeLists.txt
@@ -19,3 +19,9 @@ target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} dlog)
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_face.h"
+               PATTERN "mv_face_type.h"
+        )
\ No newline at end of file

diff --git a/mv_image/image/CMakeLists.txt b/mv_image/image/CMakeLists.txt
index 20c87e2..acd0480 100644 (file)
--- a/mv_image/image/CMakeLists.txt
+++ b/mv_image/image/CMakeLists.txt
@@ -19,3 +19,9 @@ target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS})
 target_include_directories(${PROJECT_NAME} PUBLIC include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_image.h"
+               PATTERN "mv_image_type.h"
+        )
\ No newline at end of file

diff --git a/mv_machine_learning/face_recognition/CMakeLists.txt b/mv_machine_learning/face_recognition/CMakeLists.txt
index 6059e4f..c497a80 100644 (file)
--- a/mv_machine_learning/face_recognition/CMakeLists.txt
+++ b/mv_machine_learning/face_recognition/CMakeLists.txt
@@ -19,3 +19,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_inference mv_training)
 target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../training/include ../common/include ../meta/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+       DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+       FILES_MATCHING
+       PATTERN "mv_face_recognition.h"
+       PATTERN "mv_face_recognition_type.h"
+       )
\ No newline at end of file

diff --git a/mv_machine_learning/image_classification/CMakeLists.txt b/mv_machine_learning/image_classification/CMakeLists.txt
index 58391f4..ce058f3 100644 (file)
--- a/mv_machine_learning/image_classification/CMakeLists.txt
+++ b/mv_machine_learning/image_classification/CMakeLists.txt
@@ -19,3 +19,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_inference)
 target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../common/include ../meta/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+       DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+       FILES_MATCHING
+       PATTERN "mv_image_classification_internal.h"
+       PATTERN "mv_image_classification_type.h"
+       )
\ No newline at end of file

diff --git a/mv_machine_learning/inference/CMakeLists.txt b/mv_machine_learning/inference/CMakeLists.txt
index 0c3ed0f..51d96fa 100644 (file)
--- a/mv_machine_learning/inference/CMakeLists.txt
+++ b/mv_machine_learning/inference/CMakeLists.txt
@@ -24,3 +24,10 @@ ENDIF()
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PRIVATE include ../common/include ../meta/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+               PATTERN "mv_inference.h"
+        PATTERN "mv_inference_private.h"
+               PATTERN "mv_inference_type.h"
+        )
\ No newline at end of file

diff --git a/mv_machine_learning/object_detection/CMakeLists.txt b/mv_machine_learning/object_detection/CMakeLists.txt
index b11a6aa..d002396 100644 (file)
--- a/mv_machine_learning/object_detection/CMakeLists.txt
+++ b/mv_machine_learning/object_detection/CMakeLists.txt
@@ -19,3 +19,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_inference)
 target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../common/include ../meta/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+       DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+       FILES_MATCHING
+       PATTERN "mv_object_detection_internal.h"
+       PATTERN "mv_object_detection_type.h"
+       )

diff --git a/mv_machine_learning/object_detection_3d/CMakeLists.txt b/mv_machine_learning/object_detection_3d/CMakeLists.txt
index 8889bb3..a9a9f4b 100644 (file)
--- a/mv_machine_learning/object_detection_3d/CMakeLists.txt
+++ b/mv_machine_learning/object_detection_3d/CMakeLists.txt
@@ -19,3 +19,9 @@ endif()
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_inference)
 target_include_directories(${PROJECT_NAME} PRIVATE include ../inference/include ../common/include ../meta/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+       DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+       FILES_MATCHING
+       PATTERN "mv_object_detection_3d_internal.h"
+       PATTERN "mv_object_detection_3d_type.h"
+       )
\ No newline at end of file

diff --git a/mv_roi_tracker/roi_tracker/CMakeLists.txt b/mv_roi_tracker/roi_tracker/CMakeLists.txt
index da87d53..ee3acf4 100644 (file)
--- a/mv_roi_tracker/roi_tracker/CMakeLists.txt
+++ b/mv_roi_tracker/roi_tracker/CMakeLists.txt
@@ -20,3 +20,9 @@ target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${P
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+        PATTERN "mv_roi_tracker.h"
+               PATTERN "mv_roi_tracker_type.h"
+        )
\ No newline at end of file

diff --git a/mv_surveillance/surveillance/CMakeLists.txt b/mv_surveillance/surveillance/CMakeLists.txt
index fd001b9..f23e28f 100644 (file)
--- a/mv_surveillance/surveillance/CMakeLists.txt
+++ b/mv_surveillance/surveillance/CMakeLists.txt
@@ -18,3 +18,9 @@ target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${MV_FACE_LIB_NAME})
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
+install(
+        DIRECTORY ${PROJECT_SOURCE_DIR}/../../include/ DESTINATION include/media
+        FILES_MATCHING
+        PATTERN "mv_surveillance_private.h"
+               PATTERN "mv_surveillance.h"
+        )
\ No newline at end of file