mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-16 19:35:27 +08:00
45 lines
1.7 KiB
Diff
45 lines
1.7 KiB
Diff
|
diff --git a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
|
||
|
|
index d18523352..1f53945cf 100644
|
||
|
|
--- a/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
|
||
|
|
+++ b/aten/src/ATen/native/quantized/cpu/qnnpack/CMakeLists.txt
|
||
|
|
@@ -389,12 +389,12 @@ if(NOT TARGET fxdiv AND NOT USE_SYSTEM_FXDIV)
|
||
|
|
"${FXDIV_SOURCE_DIR}"
|
||
|
|
"${CONFU_DEPENDENCIES_BINARY_DIR}/fxdiv")
|
||
|
|
elseif(NOT TARGET fxdiv AND USE_SYSTEM_FXDIV)
|
||
|
|
- find_file(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
|
||
|
|
+ find_path(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
|
||
|
|
if(NOT FXDIV_HDR)
|
||
|
|
message(FATAL_ERROR "Cannot find fxdiv")
|
||
|
|
endif()
|
||
|
|
- add_library(fxdiv STATIC "${FXDIV_HDR}")
|
||
|
|
- set_property(TARGET fxdiv PROPERTY LINKER_LANGUAGE C)
|
||
|
|
+ add_library(fxdiv INTERFACE IMPORTED)
|
||
|
|
+ target_include_directories(fxdiv INTERFACE "${FXDIV_HDR}")
|
||
|
|
endif()
|
||
|
|
target_link_libraries(pytorch_qnnpack PRIVATE fxdiv)
|
||
|
|
|
||
|
|
diff --git a/caffe2/CMakeLists.txt b/caffe2/CMakeLists.txt
|
||
|
|
index f7a595e1b..fb315c435 100644
|
||
|
|
--- a/caffe2/CMakeLists.txt
|
||
|
|
+++ b/caffe2/CMakeLists.txt
|
||
|
|
@@ -108,11 +108,18 @@ endif()
|
||
|
|
# addressed yet.
|
||
|
|
|
||
|
|
if(NOT MSVC AND USE_XNNPACK)
|
||
|
|
- if(NOT TARGET fxdiv)
|
||
|
|
+ if(NOT TARGET fxdiv AND NOT USE_SYSTEM_FXDIV)
|
||
|
|
set(FXDIV_BUILD_TESTS OFF CACHE BOOL "")
|
||
|
|
set(FXDIV_BUILD_BENCHMARKS OFF CACHE BOOL "")
|
||
|
|
add_subdirectory(
|
||
|
|
"${FXDIV_SOURCE_DIR}"
|
||
|
|
"${CMAKE_BINARY_DIR}/FXdiv")
|
||
|
|
+ elseif(NOT TARGET fxdiv AND USE_SYSTEM_FXDIV)
|
||
|
|
+ find_path(FXDIV_HDR fxdiv.h PATH_SUFFIXES include)
|
||
|
|
+ if(NOT FXDIV_HDR)
|
||
|
|
+ message(FATAL_ERROR "Cannot find fxdiv")
|
||
|
|
+ endif()
|
||
|
|
+ add_library(fxdiv INTERFACE IMPORTED)
|
||
|
|
+ target_include_directories(fxdiv INTERFACE "${FXDIV_HDR}")
|
||
|
|
endif()
|
||
|
|
endif()
|