blob: 614a39ce3b8ff42685d264772c2ccde8e685cddb (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index a027c69e0..eb7608518 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -733,7 +733,7 @@
if (NOT WIN32)
if (onnxruntime_PREFER_SYSTEM_LIB)
- find_package(nsync)
+ find_package(nsync_cpp)
endif()
if (TARGET nsync_cpp) # linking error with nsync_FOUND (why?)
message("Use nsync from preinstalled system lib")
@@ -764,9 +765,11 @@ if(onnxruntime_DISABLE_EXCEPTIONS)
endif()
if (onnxruntime_PREFER_SYSTEM_LIB)
- find_package(re2)
+ find_package(PkgConfig)
+ pkg_check_modules(RE2 IMPORTED_TARGET re2)
+ add_library(re2::re2 ALIAS PkgConfig::RE2)
endif()
-if (re2_FOUND)
+if (TARGET re2::re2)
message("Use re2 from preinstalled system lib")
else()
add_subdirectory(external/re2 EXCLUDE_FROM_ALL)
@@ -1421,7 +1421,7 @@
endif()
if (Flatbuffers_FOUND)
message("Use flatbuffers from preinstalled system lib")
- add_library(flatbuffers ALIAS flatbuffers::flatbuffers)
+ add_library(flatbuffers ALIAS flatbuffers::flatbuffers_shared)
else()
message("Use flatbuffers from submodule")
# We do not need to build flatc for iOS or Android Cross Compile
--- a/setup.py 2022-07-22 17:00:19.638893453 +0800
+++ b/setup.py 2022-07-22 17:02:00.686317628 +0800
@@ -16,7 +16,7 @@
from setuptools import Extension, setup
from setuptools.command.install import install as InstallCommandBase
-from wheel.vendored.packaging.tags import sys_tags
+from packaging.tags import sys_tags
nightly_build = False
package_name = "onnxruntime"
|