[tensorflow(-cc)] no absolute paths

microsoft · Dec 22, 2021 · ca311fc · ca311fc
1 parent 0fd31b9
commit ca311fc
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 4 deletions.
diff --git a/ports/tensorflow-cc/portfile.cmake b/ports/tensorflow-cc/portfile.cmake
@@ -6,7 +6,7 @@ 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")
+set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external \${TENSORFLOW_INSTALL_PREFIX}/include/tensorflow-external/src")
 list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common")
 include(tensorflow-common)
 

diff --git a/ports/tensorflow-cc/vcpkg.json b/ports/tensorflow-cc/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorflow-cc",
   "version-semver": "2.7.0",
+  "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/ports/tensorflow/portfile.cmake b/ports/tensorflow/portfile.cmake
@@ -2,7 +2,7 @@ vcpkg_fail_port_install(ON_ARCH "x86" "arm" ON_TARGET "uwp")
 
 set(TF_LIB_SUFFIX "")
 set(TF_PORT_SUFFIX "")
-set(TF_INCLUDE_DIRS "${CURRENT_INSTALLED_DIR}/include")
+set(TF_INCLUDE_DIRS "\${TENSORFLOW_INSTALL_PREFIX}/include")
 list(APPEND CMAKE_MODULE_PATH "${CURRENT_INSTALLED_DIR}/share/tensorflow-common")
 include(tensorflow-common)
 

diff --git a/ports/tensorflow/vcpkg.json b/ports/tensorflow/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "tensorflow",
   "version-semver": "2.7.0",
+  "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
@@ -6698,11 +6698,11 @@
     },
     "tensorflow": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tensorflow-cc": {
       "baseline": "2.7.0",
-      "port-version": 0
+      "port-version": 1
     },
     "tensorflow-common": {
       "baseline": "2.7.0",

diff --git a/versions/t-/tensorflow-cc.json b/versions/t-/tensorflow-cc.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "48be8a2aea85f73821084ea35d307e4033726565",
+      "version-semver": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "f0bd2999562da259b6e2c39131a6a02f632b21a8",
       "version-semver": "2.7.0",

diff --git a/versions/t-/tensorflow.json b/versions/t-/tensorflow.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "4f02ceeb872646409f83a5b164c9892322d75e6b",
+      "version-semver": "2.7.0",
+      "port-version": 1
+    },
     {
       "git-tree": "b12af58d1b9069b6ab8b2de9e1c6c7f2b07aadfe",
       "version-semver": "2.7.0",