[llvm] no absolute paths (#24878)

microsoft · May 24, 2022 · c40e73f · c40e73f
1 parent 6a66e95
commit c40e73f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 1 deletion.
diff --git a/ports/llvm/portfile.cmake b/ports/llvm/portfile.cmake
@@ -302,6 +302,11 @@ if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
     )
 endif()
 
+if("mlir" IN_LIST FEATURES)
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "set(MLIR_MAIN_SRC_DIR \"${SOURCE_PATH}/mlir\")" "")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/mlir/MLIRConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "\${MLIR_INCLUDE_DIRS}")
+endif()
+
 # LLVM still generates a few DLLs in the static build:
 # * LLVM-C.dll
 # * libclang.dll

diff --git a/ports/llvm/vcpkg.json b/ports/llvm/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "llvm",
   "version": "14.0.3",
+  "port-version": 1,
   "description": "The LLVM Compiler Infrastructure.",
   "homepage": "https://llvm.org",
   "license": "Apache-2.0",

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -4266,7 +4266,7 @@
     },
     "llvm": {
       "baseline": "14.0.3",
-      "port-version": 0
+      "port-version": 1
     },
     "lmdb": {
       "baseline": "0.9.29",

diff --git a/versions/l-/llvm.json b/versions/l-/llvm.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "741b89d3872cb0152d5c295ce075b8d751381f51",
+      "version": "14.0.3",
+      "port-version": 1
+    },
     {
       "git-tree": "751084451d4807176af868b2edab17131c2e4a09",
       "version": "14.0.3",