Update srcn kernel library cmake (#7135)
author오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Thu, 5 Sep 2019 02:13:11 +0000 (11:13 +0900)
committerGitHub Enterprise <noreply-CODE@samsung.com>
Thu, 5 Sep 2019 02:13:11 +0000 (11:13 +0900)
Use finding arm_neon.h instead of checking target arch
Link libraries OpenMP_CXX_LIBRARIES
Prepare compile definition NCNN and comment out

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>
runtimes/libs/srcn/CMakeLists.txt

index f14dd5e..c6ad823 100644 (file)
@@ -1,20 +1,26 @@
-if("${TARGET_ARCH}" STREQUAL "x86_64")
-  return()
-endif()
-
 # Find and use pre-installed OpenMP
 find_package(OpenMP QUIET)
 if(NOT OpenMP_FOUND)
   return()
 endif(NOT OpenMP_FOUND)
 
+# Include arm_neon.h in src/common.h
+find_path(TARGET_HEADER arm_neon.h)
+if(NOT TARGET_HEADER)
+  message(STATUS "Check for SRCN kernel library build: need arm_neon header")
+  return()
+else(NOT TARGET_HEADER)
+  message(STATUS "Check for SRCN kernel library build: OK")
+endif(NOT TARGET_HEADER)
+
 file(GLOB_RECURSE SOURCES "*.cc")
 file(GLOB_RECURSE TESTS "*_test.cc")
 list(REMOVE_ITEM SOURCES ${TESTS})
 
 add_library(nnfw_lib_srcn STATIC ${SOURCES})
 target_include_directories(nnfw_lib_srcn PUBLIC include)
-target_link_libraries(nnfw_lib_srcn PRIVATE ${OpenMP_CXX_FLAGS})
+target_link_libraries(nnfw_lib_srcn PRIVATE ${OpenMP_CXX_LIBRARIES})
 target_compile_options(nnfw_lib_srcn PRIVATE ${OpenMP_CXX_FLAGS})
-target_compile_options(nnfw_lib_srcn PRIVATE -DTIZEN)
+target_compile_definitions(nnfw_lib_srcn PRIVATE TIZEN) # ANDROID or TIZEN
+#target_compile_definitions(nnfw_lib_srcn PRIVATE NCNN) # Enable if ready
 set_target_properties(nnfw_lib_srcn PROPERTIES POSITION_INDEPENDENT_CODE ON)