[hpx] no absolute paths (#27035)

microsoft · Sep 30, 2022 · 1d3eafa · 1d3eafa
1 parent d987016
commit 1d3eafa
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
@@ -90,13 +90,11 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 vcpkg_fixup_pkgconfig()
 
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))")
-vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx" "\"${CURRENT_PACKAGES_DIR}/debug\"" "os.path.dirname(os.path.dirname(os.path.realpath(__file__)))")
-
 file(REMOVE "${CURRENT_PACKAGES_DIR}/bin/hpxcxx" "${CURRENT_PACKAGES_DIR}/debug/bin/hpxcxx")
 
 file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}")
 file(RENAME "${CURRENT_PACKAGES_DIR}/bin/hpxrun.py" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py")
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/hpxrun.py" "'${CURRENT_INSTALLED_DIR}/tools/openmpi/bin/mpiexec'" "'mpiexec'")
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
     file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")

diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hpx",
   "version": "1.8.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": [
     "The C++ Standards Library for Concurrency and Parallelism",
     "HPX is a C++ Standards Library for Concurrency and Parallelism. It implements all of the corresponding facilities as defined by the C++ Standard. Additionally, in HPX we implement functionalities proposed as part of the ongoing C++ standardization process. We also extend the C++ Standard APIs to the distributed case."

diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2902,7 +2902,7 @@
     },
     "hpx": {
       "baseline": "1.8.0",
-      "port-version": 1
+      "port-version": 2
     },
     "http-parser": {
       "baseline": "2.9.4",

diff --git a/versions/h-/hpx.json b/versions/h-/hpx.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "65b93e6c2b9660897d82d6dd32c0edb6689aa6e6",
+      "version": "1.8.0",
+      "port-version": 2
+    },
     {
       "git-tree": "aaf58e8627662fd841d011ea7e71d23507573772",
       "version": "1.8.0",