aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Gehweiler <44170764+jgehw@users.noreply.github.com>2021-08-12 02:24:04 +0200
committerGitHub <noreply@github.com>2021-08-11 17:24:04 -0700
commit32950ca774a0c2f90c2105b65b594db53d0b40a7 (patch)
tree2d9caeb02029419f0ee48d1d97f8547fa25c2cf3
parenteba4f2ca58a7ad39608063e83d7f460802dbb038 (diff)
downloadvcpkg-32950ca774a0c2f90c2105b65b594db53d0b40a7.tar.gz
vcpkg-32950ca774a0c2f90c2105b65b594db53d0b40a7.zip
[tensorflow-cc] on x64 Windows with dynamic linkage misses C++ symbols in DLL (#19364)
-rw-r--r--ports/tensorflow-cc/portfile.cmake4
-rw-r--r--ports/tensorflow-cc/vcpkg.json1
-rw-r--r--versions/baseline.json2
-rw-r--r--versions/t-/tensorflow-cc.json5
4 files changed, 11 insertions, 1 deletions
diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake
index f905397eb..2c1cfc2db 100644
--- a/ports/tensorflow-cc/portfile.cmake
+++ b/ports/tensorflow-cc/portfile.cmake
@@ -1,5 +1,9 @@
vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "UWP")
+if(VCPKG_TARGET_IS_WINDOWS)
+ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
+endif()
+
set(TF_LIB_SUFFIX "_cc")
set(TF_PORT_SUFFIX "-cc")
set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include/tensorflow-external ${CURRENT_INSTALLED_DIR}/include/tensorflow-external/src")
diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json
index fe5503d3b..d67e50c93 100644
--- a/ports/tensorflow-cc/vcpkg.json
+++ b/ports/tensorflow-cc/vcpkg.json
@@ -1,6 +1,7 @@
{
"name": "tensorflow-cc",
"version-semver": "2.4.1",
+ "port-version": 1,
"description": "Library for computation using data flow graphs for scalable machine learning (C++ API version)",
"homepage": "https://github.com/tensorflow/tensorflow",
"supports": "!(x86 | arm | uwp)",
diff --git a/versions/baseline.json b/versions/baseline.json
index 984486a35..0339d5c72 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -6222,7 +6222,7 @@
},
"tensorflow-cc": {
"baseline": "2.4.1",
- "port-version": 0
+ "port-version": 1
},
"tensorflow-common": {
"baseline": "2.4.1",
diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json
index 1711cad05..b43b8b239 100644
--- a/versions/t-/tensorflow-cc.json
+++ b/versions/t-/tensorflow-cc.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "77875da04a151fb36abe52cce80491a9a7f16c55",
+ "version-semver": "2.4.1",
+ "port-version": 1
+ },
+ {
"git-tree": "868e7ae57409669692df84ddb446f4a235e0b220",
"version-semver": "2.4.1",
"port-version": 0