From: Inki Dae Date: Mon, 9 Sep 2024 06:26:26 +0000 (+0900) Subject: test: do not build visualizer X-Git-Tag: accepted/tizen/unified/20240911.104743~10 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3df81ad4434626e509c50259366ec8bd9cc86c2d;p=platform%2Fcore%2Fapi%2Fsingleo.git test: do not build visualizer Do not build visualizer and relevant test binaries. The visualizer is used only for test so this patch disables visualizer module and relevant test binaries in default. If we want to enable visualizer then just set below flag to 1 in spec file, %define enable_visualizer 0 Change-Id: I1a86bf215ed553c9d4e5bd342597bf2ce6c552ae Signed-off-by: Inki Dae --- diff --git a/CMakeLists.txt b/CMakeLists.txt index b297de8..3476d5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,9 @@ ADD_SUBDIRECTORY(input) ADD_SUBDIRECTORY(inference) ADD_SUBDIRECTORY(services) ADD_SUBDIRECTORY(test) -ADD_SUBDIRECTORY(visualizer) +IF (${USE_VISUALIZER}) + ADD_SUBDIRECTORY(visualizer) +ENDIF() SET(PC_NAME ${PROJECT_NAME}) SET(PC_LDFLAGS -l${PROJECT_NAME}) diff --git a/packaging/singleo.spec b/packaging/singleo.spec index 5b77619..79edf4f 100644 --- a/packaging/singleo.spec +++ b/packaging/singleo.spec @@ -19,6 +19,8 @@ BuildRequires: pkgconfig(protobuf) BuildRequires: pkgconfig(grpc++) BuildRequires: pkgconfig(re2) +%define enable_visualizer 0 + %description SingleO AI Service Framework @@ -58,7 +60,8 @@ MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` -DUSE_INPUT_OPENCV_BACKEND=ON \ -DUSE_AUTOZOOM_API=ON \ -DUSE_FOCUSFINDER_API=ON \ - -DUSE_INPUT_CAMERA_API_BACKEND=ON + -DUSE_INPUT_CAMERA_API_BACKEND=ON \ + -DUSE_VISUALIZER=%{enable_visualizer} make %{?jobs:-j%jobs} @@ -74,7 +77,9 @@ rm -rf %{buildroot} %manifest singleo.manifest %license LICENSE.APLv2 %{_libdir}/libsingleo_service.so +%if "%{enable_visualizer}" == "1" %{_libdir}/libsingleo_visualizer.so +%endif %files devel %{_libdir}/pkgconfig/*.pc @@ -104,5 +109,7 @@ rm -rf %{buildroot} %files test %{_bindir}/test_singleo +%if "%{enable_visualizer}" == "1" %{_bindir}/test_singleo_on_screen +%endif %{_bindir}/test_singleo_task_manger diff --git a/test/services/CMakeLists.txt b/test/services/CMakeLists.txt index 580a3cd..87f6667 100644 --- a/test/services/CMakeLists.txt +++ b/test/services/CMakeLists.txt @@ -22,22 +22,30 @@ TARGET_LINK_LIBRARIES(${PROJECT_NAME} INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR}) -SET(TEST_SOURCE_ON_SCREEN_LIST test_autozoom_on_screen.cpp) +FIND_PACKAGE(OpenCV REQUIRED imgproc highgui) +IF(NOT OpenCV_FOUND) + MESSAGE(SEND_ERROR "Failed to find OpenCV") + RETURN() +ENDIF() + +IF (${USE_VISUALIZER}) + SET(TEST_SOURCE_ON_SCREEN_LIST test_autozoom_on_screen.cpp) -ADD_EXECUTABLE(test_singleo_on_screen ${TEST_SOURCE_ON_SCREEN_LIST}) -TARGET_COMPILE_DEFINITIONS(test_singleo_on_screen PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}") -TARGET_INCLUDE_DIRECTORIES(test_singleo_on_screen PRIVATE ../../capi/ ../../common/include ../../visualizer/include) -TARGET_LINK_LIBRARIES(test_singleo_on_screen - gtest gtest_main pthread singleo_service singleo_visualizer opencv_imgcodecs) + ADD_EXECUTABLE(test_singleo_on_screen ${TEST_SOURCE_ON_SCREEN_LIST}) + TARGET_COMPILE_DEFINITIONS(test_singleo_on_screen PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}") + TARGET_INCLUDE_DIRECTORIES(test_singleo_on_screen PRIVATE ${OpenCV_INCLUDE_DIRS} ../../capi/ ../../common/include ../../visualizer/include) + TARGET_LINK_LIBRARIES(test_singleo_on_screen + gtest gtest_main pthread singleo_service singleo_visualizer ${OpenCV_LIBS}) -INSTALL(TARGETS test_singleo_on_screen DESTINATION ${CMAKE_INSTALL_BINDIR}) + INSTALL(TARGETS test_singleo_on_screen DESTINATION ${CMAKE_INSTALL_BINDIR}) +ENDIF() SET(TEST_SOURCE_TASK_MANAGER_LIST test_task_manager.cpp) ADD_EXECUTABLE(test_singleo_task_manger ${TEST_SOURCE_TASK_MANAGER_LIST}) TARGET_COMPILE_DEFINITIONS(test_singleo_task_manger PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}") -TARGET_INCLUDE_DIRECTORIES(test_singleo_task_manger PRIVATE ../../capi/ ../../common/include ../../inference/include ../../services/task_manager/include ../../services/common/include ../../visualizer/include) +TARGET_INCLUDE_DIRECTORIES(test_singleo_task_manger PRIVATE ${OpenCV_INCLUDE_DIRS} ../../capi/ ../../common/include ../../log/include ../../inference/include ../../services/task_manager/include ../../services/common/include) TARGET_LINK_LIBRARIES(test_singleo_task_manger - gtest gtest_main pthread singleo_service singleo_visualizer opencv_imgcodecs) + gtest gtest_main pthread singleo_service ${OpenCV_LIBS}) INSTALL(TARGETS test_singleo_task_manger DESTINATION ${CMAKE_INSTALL_BINDIR})