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 cf75b372417e0c5a3fe4a1fb835259313c69cabd..701ef3144b6302c92d221c7821e40c50d60af4fd 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 5d2e81abfc77f98471b8073e0be016dde7b7aee5..74646e41a6701b3a874207ae6b6d3ee865f2e071 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 7a8a93c55e258062c4ea2836fd12d018301b3e10..a7eb185a2e9cab46d2c65f6c3d7854007b16e4e6 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 3091ca9baedfedd0a8616009667808049097ed51..3a822d8a5f3a5cd3234a5b99fb3539f2ce81ec45 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 6434960e779e0543f75d88d8994104ffac996280..3fae4ea18c51e0bc360e0d7bdb5ef4aac571a6bb 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 afad25a64c8ca72459c53963d9943ae224c90ab1..7e05d57b29375afdd7881a23a195635a0f92af59 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 20c87e2e6e93b76e02bae104c3a8193cf44bac57..acd04803d17169e88ddd469ddc4533ebc4138d35 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 6059e4f2f1ea950da27d494fe281362eebb1c161..c497a807d943f2a6f9e57333d1b710f5fdd36888 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 58391f44bd6855c19344b57dcb1f8ef1ce46734e..ce058f375f849dbc7f707c7bcb85c0a91b079176 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 0c3ed0fc6da876cc9631b9ae533aa07f3e779c76..51d96faabf5311f11640088c709c77006a7c931f 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 b11a6aafa4e87a32d2649c77a5ccb4f7dd71a1a2..d00239669f8c3538144f0494cc33822519ce16c7 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 8889bb36cb628fd3c31ab5bc4ae650b4e22fd3ae..a9a9f4bd363e3bb940ddeb16e2ce531868343038 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 da87d5343c9eb30436ce94ba71697e063f20c34f..ee3acf46d43379889a4974e1aeb4fcf9f2667872 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 fd001b957fe92ac2633f6463ede3ae86ec011b42..f23e28f64a19cd23ce1f9cbe8d4b8139a7029e57 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