summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cmake/packages/NEON2SSESourceConfig.cmake6
-rw-r--r--externals/CMakeLists.txt10
2 files changed, 11 insertions, 5 deletions
diff --git a/cmake/packages/NEON2SSESourceConfig.cmake b/cmake/packages/NEON2SSESourceConfig.cmake
index b656f5700..f39e842a8 100644
--- a/cmake/packages/NEON2SSESourceConfig.cmake
+++ b/cmake/packages/NEON2SSESourceConfig.cmake
@@ -4,6 +4,12 @@ function(_NEON2SSESource_import)
return()
endif(NOT DOWNLOAD_NEON2SSE)
+ # TODO Remove this workaround once target preset is ready
+ if(NOT (TARGET_ARCH_BASE STREQUAL "x86_64"))
+ set(NEON2SSESource_FOUND FALSE PARENT_SCOPE)
+ return()
+ endif(NOT (TARGET_ARCH_BASE STREQUAL "x86_64"))
+
nnfw_include(ExternalSourceTools)
nnfw_include(OptionTools)
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index b51aa45cf..a63c0729b 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -50,11 +50,11 @@ list(APPEND TFLITE_INCLUDES "${TFLITE_DEPEND_DIR}/gemmlowp")
list(APPEND TFLITE_INCLUDES "${TFLITE_DEPEND_DIR}/farmhash/src")
list(APPEND TFLITE_INCLUDES "${TFLITE_DEPEND_DIR}/flatbuffers/include")
-if(BUILD_IS_NATIVE AND NOT HOST_ARCH_BASE STREQUAL "arm")
- # Required external sourcefor x86-64 build
- nnfw_find_package(NEON2SSESource REQUIRED)
- list(APPEND TFLITE_INCLUDES "${TFLITE_DEPEND_DIR}/neon_2_sse")
-endif()
+nnfw_find_package(NEON2SSESource QUIET)
+
+if(NEON2SSESource_FOUND)
+ list(APPEND TFLITE_INCLUDES "${NEON2SSESource_DIR}")
+endif(NEON2SSESource_FOUND)
# This kernels are not used on nnfw
## spectrogram