Support barcode generation on Ubuntu

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddc1f654e3291f31cdbee6cd90a792b156806018..efa3523a5a255c3026bfbacdda1592fba15a2c83 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,8 +66,8 @@ endif()
 
 add_subdirectory(mv_common)
 add_subdirectory(mv_machine_learning)
+add_subdirectory(mv_barcode)
 if(${IS_TIZEN})
-    add_subdirectory(mv_barcode)
     add_subdirectory(mv_image)
     add_subdirectory(mv_face)
     add_subdirectory(mv_surveillance)

diff --git a/mv_barcode/CMakeLists.txt b/mv_barcode/CMakeLists.txt
index 7fadf956b648e5234b0cf5d26adc97e5f4925014..2ee94fb2162424a5e60b8076eb193e47831f9a33 100644 (file)
--- a/mv_barcode/CMakeLists.txt
+++ b/mv_barcode/CMakeLists.txt
@@ -1,2 +1,4 @@
-add_subdirectory(barcode_detector)
+if(${IS_TIZEN})
+    add_subdirectory(barcode_detector)
+endif()
 add_subdirectory(barcode_generator)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a4f94adeef49cd78e60407e9ddfe9ff1c97a170c..8707e5dec6947340728adc9889d20af3490ef264 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -19,13 +19,13 @@ set(SRC_FILES
     testsuites/machine_learning/inference/test_object_detection.cpp
     testsuites/machine_learning/inference/test_face_detection.cpp
     testsuites/machine_learning/inference/test_face_landmark_detection.cpp
-    testsuites/machine_learning/inference/test_pose_landmark_detection.cpp)
+    testsuites/machine_learning/inference/test_pose_landmark_detection.cpp
+    testsuites/barcode/test_barcode.cpp
+    testsuites/barcode/test_designqr.cpp)
 
 if(${IS_TIZEN})
   set(SRC_FILES ${SRC_FILES}
-  testsuites/common/test_pkt.cpp
-  testsuites/barcode/test_barcode.cpp
-  testsuites/barcode/test_designqr.cpp)
+  testsuites/common/test_pkt.cpp)
 endif()
 
 if (${ENABLE_ML_FACE_RECOGNITION})
@@ -65,10 +65,10 @@ add_executable(${PROJECT_NAME} ${SRC_FILES})
 target_compile_definitions(${PROJECT_NAME} PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}")
 target_link_libraries(${PROJECT_NAME}
     gtest gtest_main mv_inference mv_image_helper
-    pthread mv_ml_common)
+    pthread mv_ml_common ${MV_BARCODE_GENERATOR_LIB_NAME})
 
 if(${IS_TIZEN})
-target_link_libraries(${PROJECT_NAME} ${MV_BARCODE_DETECTOR_LIB_NAME} ${MV_BARCODE_GENERATOR_LIB_NAME})
+target_link_libraries(${PROJECT_NAME} ${MV_BARCODE_DETECTOR_LIB_NAME})
 endif()
 
 if (${ENABLE_ML_FACE_RECOGNITION})