add ubuntu build support

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

diff --git a/inference/CMakeLists.txt b/inference/CMakeLists.txt
index b501c0cb2893868b4e3d58e4f8c96bc1ae0b431c..389837bf9af369a3ff328e863ad430faec206bff 100644 (file)
--- a/inference/CMakeLists.txt
+++ b/inference/CMakeLists.txt
@@ -2,7 +2,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.13)
 
 SET(INFERENCE_DIRECTORY ${ROOT_DIRECTORY}/inference)
 
-INCLUDE(${INFERENCE_DIRECTORY}/backends/mediavision/CMakeLists.txt)
+IF (${USE_MEDIAVISION})
+    INCLUDE(${INFERENCE_DIRECTORY}/backends/mediavision/CMakeLists.txt)
+ENDIF()
 
 IF (${USE_3RDPARTY_FACEDETECTION})
        INCLUDE(${INFERENCE_DIRECTORY}/backends/3rdparty/CMakeLists.txt)

diff --git a/services/CMakeLists.txt b/services/CMakeLists.txt
index ef6c4427eaffb0be303141471d61118088aa49ff..363f1ce8d14f79d783edc32a2bda890da953ff46 100644 (file)
--- a/services/CMakeLists.txt
+++ b/services/CMakeLists.txt
@@ -26,7 +26,7 @@ ENDIF()
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${SINGLEO_SERVICE_SOURCE_FILES})
 
-TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE include common/include ${ROOT_DIRECTORY}/capi/ ${COMMON_HEADER_LIST} ${INPUT_HEADER_LIST} ${INFERENCE_HEADER_LIST} ${SERVICE_HEADER_LIST} ${LOG_HEADER_LIST})
+TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PRIVATE include /usr/local/include/opencv4 common/include ${ROOT_DIRECTORY}/capi/ ${COMMON_HEADER_LIST} ${INPUT_HEADER_LIST} ${INFERENCE_HEADER_LIST} ${SERVICE_HEADER_LIST} ${LOG_HEADER_LIST})
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} PRIVATE opencv_core opencv_imgcodecs opencv_highgui opencv_videoio opencv_calib3d ${INFERENCE_LIBRARY_LIST} ${SERVICE_LIBRARY_LIST} ${LOG_LIBRARY_LIST})
 
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
\ No newline at end of file
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR} /usr/local/lib)
\ No newline at end of file

diff --git a/test/services/CMakeLists.txt b/test/services/CMakeLists.txt
index 33f21d0466447ba57942ab8455b162155adf2267..106e0c0e4b2eeeda548fbd77eb0c18d0ecf7a4a5 100644 (file)
--- a/test/services/CMakeLists.txt
+++ b/test/services/CMakeLists.txt
@@ -39,17 +39,17 @@ IF (${USE_VISUALIZER})
         gtest gtest_main pthread singleo_service singleo_visualizer ${OpenCV_LIBS})
 
     INSTALL(TARGETS test_singleo_on_screen DESTINATION ${CMAKE_INSTALL_BINDIR})
-ENDIF()
 
-SET(TEST_SOURCE_AIRGESTURE_LIST test_airgesture_on_screen.cpp)
+    SET(TEST_SOURCE_AIRGESTURE_LIST test_airgesture_on_screen.cpp)
 
-ADD_EXECUTABLE(test_singleo_airgesture ${TEST_SOURCE_AIRGESTURE_LIST})
-TARGET_COMPILE_DEFINITIONS(test_singleo_airgesture PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}")
-TARGET_INCLUDE_DIRECTORIES(test_singleo_airgesture PRIVATE ../../capi/ ../../common/include ../../log/include ../../visualizer/include)
-TARGET_LINK_LIBRARIES(test_singleo_airgesture
-    gtest gtest_main pthread singleo_service singleo_visualizer opencv_imgcodecs)
+    ADD_EXECUTABLE(test_singleo_airgesture ${TEST_SOURCE_AIRGESTURE_LIST})
+    TARGET_COMPILE_DEFINITIONS(test_singleo_airgesture PRIVATE -DTEST_RES_PATH="${TEST_RES_PATH}")
+    TARGET_INCLUDE_DIRECTORIES(test_singleo_airgesture PRIVATE ../../capi/ ../../common/include ../../log/include ../../visualizer/include)
+    TARGET_LINK_LIBRARIES(test_singleo_airgesture
+        gtest gtest_main pthread singleo_service singleo_visualizer opencv_imgcodecs)
 
-INSTALL(TARGETS test_singleo_airgesture DESTINATION ${CMAKE_INSTALL_BINDIR})
+    INSTALL(TARGETS test_singleo_airgesture DESTINATION ${CMAKE_INSTALL_BINDIR})
+ENDIF()
 
 SET(TEST_SOURCE_TASK_MANAGER_LIST test_task_manager.cpp)