Remove FORCED_STATIC_BUILD option

Static link option is never used.

[Issue type] Refactoring

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

diff --git a/mv_3d/3d/CMakeLists.txt b/mv_3d/3d/CMakeLists.txt
index 2d20be491887bbf12502a0a2c0aef89ddd32d7a2..9f009977c04561aa85bd22cd5afb2ae096f456f1 100644 (file)
--- a/mv_3d/3d/CMakeLists.txt
+++ b/mv_3d/3d/CMakeLists.txt
@@ -20,12 +20,7 @@ if(MV_3D_POINTCLOUD_IS_AVAILABLE)
        endif()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_DFS_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_DFS_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_DFS_SOURCE_LIST})
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
 
 if(MV_3D_POINTCLOUD_IS_AVAILABLE)

diff --git a/mv_barcode/barcode_detector/CMakeLists.txt b/mv_barcode/barcode_detector/CMakeLists.txt
index a7eb185a2e9cab46d2c65f6c3d7854007b16e4e6..20fc09cdcdcbd55d619b037d6f750776b6777734 100644 (file)
--- a/mv_barcode/barcode_detector/CMakeLists.txt
+++ b/mv_barcode/barcode_detector/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
     return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_DET_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_DET_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_DET_SRC_LIST})
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${MV_COMMON_LIB_NAME} zbar dlog)
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)

diff --git a/mv_barcode/barcode_generator/CMakeLists.txt b/mv_barcode/barcode_generator/CMakeLists.txt
index 3a822d8a5f3a5cd3234a5b99fb3539f2ce81ec45..673c3e000b272040f06381879c4a05036064ec45 100644 (file)
--- a/mv_barcode/barcode_generator/CMakeLists.txt
+++ b/mv_barcode/barcode_generator/CMakeLists.txt
@@ -6,12 +6,7 @@ file(GLOB MV_BARCODE_GEN_SRC_LIST "${PROJECT_SOURCE_DIR}/src/*.cpp"
 
 find_package(OpenCV REQUIRED imgcodecs)
 
-if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_BARCODE_GEN_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_GEN_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_BARCODE_GEN_SRC_LIST})
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} zint dlog)
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)

diff --git a/mv_common/CMakeLists.txt b/mv_common/CMakeLists.txt
index 3fae4ea18c51e0bc360e0d7bdb5ef4aac571a6bb..13654dbce2ccc40437de13a4ad392365759cf735 100644 (file)
--- a/mv_common/CMakeLists.txt
+++ b/mv_common/CMakeLists.txt
@@ -12,12 +12,7 @@ endif()
 
 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_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_COMMON_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_COMMON_SRC_LIST})
 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)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)

diff --git a/mv_face/face/CMakeLists.txt b/mv_face/face/CMakeLists.txt
index 7e05d57b29375afdd7881a23a195635a0f92af59..89754151f3fb16e244b9f716abf933abb85466d3 100644 (file)
--- a/mv_face/face/CMakeLists.txt
+++ b/mv_face/face/CMakeLists.txt
@@ -9,12 +9,7 @@ if(NOT OpenCV_FOUND)
     return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_FACE_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_FACE_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_FACE_SRC_LIST})
 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)

diff --git a/mv_image/image/CMakeLists.txt b/mv_image/image/CMakeLists.txt
index acd04803d17169e88ddd469ddc4533ebc4138d35..dadce86883cc9b7e448c5c77f6b618efb55647a4 100644 (file)
--- a/mv_image/image/CMakeLists.txt
+++ b/mv_image/image/CMakeLists.txt
@@ -9,12 +9,7 @@ if(NOT OpenCV_FOUND)
     return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_SRC_LIST})
 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)

diff --git a/mv_machine_learning/face_recognition/CMakeLists.txt b/mv_machine_learning/face_recognition/CMakeLists.txt
index 48b8a4fc8f346275a443275a7b1e3698eeeeee01..d9bcd0a4c35a35806e1feea10a9cea2a4d4630f3 100644 (file)
--- a/mv_machine_learning/face_recognition/CMakeLists.txt
+++ b/mv_machine_learning/face_recognition/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_FACE_RECOG_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_FACE_RECOG_SOURCE_LIST})
-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_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})

diff --git a/mv_machine_learning/image_classification/CMakeLists.txt b/mv_machine_learning/image_classification/CMakeLists.txt
index ce058f375f849dbc7f707c7bcb85c0a91b079176..3844240a4ef1ae1c613bc484082938f0c978356f 100644 (file)
--- a/mv_machine_learning/image_classification/CMakeLists.txt
+++ b/mv_machine_learning/image_classification/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_IMAGE_CLASSIFICATION_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_CLASSIFICATION_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_CLASSIFICATION_SOURCE_LIST})
 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})

diff --git a/mv_machine_learning/inference/CMakeLists.txt b/mv_machine_learning/inference/CMakeLists.txt
index 51d96faabf5311f11640088c709c77006a7c931f..23767dc642f9f75235340c464d69cb38fe14ff53 100644 (file)
--- a/mv_machine_learning/inference/CMakeLists.txt
+++ b/mv_machine_learning/inference/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_INFERENCE_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_INFERENCE_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_INFERENCE_SOURCE_LIST})
 IF (${ENABLE_INFERENCE_PROFILER})
     MESSAGE("Enabled Mediavision Inference Engine Profiler.")
     ADD_DEFINITIONS(-DENABLE_INFERENCE_PROFILER)

diff --git a/mv_machine_learning/landmark_detection/CMakeLists.txt b/mv_machine_learning/landmark_detection/CMakeLists.txt
index 010b0533679a38e8e8747e3050b78a069d1ad8d9..5831adb7c78d51f0a0c811ca15155c76a5d87ce1 100644 (file)
--- a/mv_machine_learning/landmark_detection/CMakeLists.txt
+++ b/mv_machine_learning/landmark_detection/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_LANDMARK_DETECTION_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_LANDMARK_DETECTION_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_LANDMARK_DETECTION_SOURCE_LIST})
 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})

diff --git a/mv_machine_learning/object_detection/CMakeLists.txt b/mv_machine_learning/object_detection/CMakeLists.txt
index ef6d88696a62be85dc947b68de5b4d1e0217d8c1..1489b8e7bb2de4bca32b727e51a6139cf89b7b7d 100644 (file)
--- a/mv_machine_learning/object_detection/CMakeLists.txt
+++ b/mv_machine_learning/object_detection/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_OBJECT_DETECTION_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_OBJECT_DETECTION_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_OBJECT_DETECTION_SOURCE_LIST})
 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})

diff --git a/mv_machine_learning/object_detection_3d/CMakeLists.txt b/mv_machine_learning/object_detection_3d/CMakeLists.txt
index a9a9f4bd363e3bb940ddeb16e2ce531868343038..85e447d74481fe3a522fae8f44daef220ac97e12 100644 (file)
--- a/mv_machine_learning/object_detection_3d/CMakeLists.txt
+++ b/mv_machine_learning/object_detection_3d/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_OBJECT_DETECTION_3D_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_OBJECT_DETECTION_3D_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_OBJECT_DETECTION_3D_SOURCE_LIST})
 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})

diff --git a/mv_machine_learning/training/CMakeLists.txt b/mv_machine_learning/training/CMakeLists.txt
index d754cd3fdeeee31ee7731429d4ed89c01f86b3eb..695a0cb895c6e83111255f3ddb48911bbd53cdea 100644 (file)
--- a/mv_machine_learning/training/CMakeLists.txt
+++ b/mv_machine_learning/training/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_TRAINING_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_TRAINING_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_TRAINING_SOURCE_LIST})
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PRIVATE include ../common/include)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/mv_roi_tracker/roi_tracker/CMakeLists.txt b/mv_roi_tracker/roi_tracker/CMakeLists.txt
index ee3acf46d43379889a4974e1aeb4fcf9f2667872..b8a7ba22e89ca0bec47f28148efc0c63d4284d26 100644 (file)
--- a/mv_roi_tracker/roi_tracker/CMakeLists.txt
+++ b/mv_roi_tracker/roi_tracker/CMakeLists.txt
@@ -10,12 +10,7 @@ if(NOT OpenCV_FOUND)
        return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-       add_library(${PROJECT_NAME} STATIC ${MV_ROI_TRACKER_SOURCE_LIST})
-else()
-       add_library(${PROJECT_NAME} SHARED ${MV_ROI_TRACKER_SOURCE_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_ROI_TRACKER_SOURCE_LIST})
 target_link_libraries(${PROJECT_NAME} ${MV_COMMON_LIB_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES})
 target_include_directories(${PROJECT_NAME} PRIVATE include)
 target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -Werror)

diff --git a/mv_surveillance/surveillance/CMakeLists.txt b/mv_surveillance/surveillance/CMakeLists.txt
index f23e28f64a19cd23ce1f9cbe8d4b8139a7029e57..bfe523a65b72a033a679333bd830458525574f25 100644 (file)
--- a/mv_surveillance/surveillance/CMakeLists.txt
+++ b/mv_surveillance/surveillance/CMakeLists.txt
@@ -4,11 +4,8 @@ cmake_minimum_required(VERSION 2.6...3.13)
 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_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_SURVEILLANCE_SRC_LIST})
-endif()
+
+add_library(${PROJECT_NAME} SHARED ${MV_SURVEILLANCE_SRC_LIST})
 
 if(ENABLE_NEON)
     target_compile_definitions(${PROJECT_NAME} PUBLIC ENABLE_NEON)

diff --git a/test/testsuites/common/image_helper/CMakeLists.txt b/test/testsuites/common/image_helper/CMakeLists.txt
index 4a8a008fa27693b453a143caa071a7d713082d72..c5b0fd53da877c09a5d6bcc64fe3a1b78fdef804 100644 (file)
--- a/test/testsuites/common/image_helper/CMakeLists.txt
+++ b/test/testsuites/common/image_helper/CMakeLists.txt
@@ -12,12 +12,7 @@ if(NOT OpenCV_FOUND)
 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})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_IMAGE_HELPER_SRC_LIST})
 target_include_directories(${PROJECT_NAME} PUBLIC include)
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBS} ${${PROJECT_NAME}_DEP_LIBRARIES} mv_common)
 install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})

diff --git a/test/testsuites/common/visualizer/CMakeLists.txt b/test/testsuites/common/visualizer/CMakeLists.txt
index 86cc7b42581acc52531f9f77351b7e4ff4488d48..e6d5980b8fc65d5789905858dfbcd5dd60d4edc3 100644 (file)
--- a/test/testsuites/common/visualizer/CMakeLists.txt
+++ b/test/testsuites/common/visualizer/CMakeLists.txt
@@ -22,12 +22,7 @@ if(NOT OpenCV_FOUND)
     return()
 endif()
 
-if(FORCED_STATIC_BUILD)
-    add_library(${PROJECT_NAME} STATIC ${MV_VISUALIZER_SRC_LIST})
-else()
-    add_library(${PROJECT_NAME} SHARED ${MV_VISUALIZER_SRC_LIST})
-endif()
-
+add_library(${PROJECT_NAME} SHARED ${MV_VISUALIZER_SRC_LIST})
 target_include_directories(${PROJECT_NAME} PUBLIC
                            ${${PROJECT_NAME}_DEP_INCLUDE_DIRS}
                            ${OpenCV_INCLUDE_DIRS}