[hpx] no absolute (#21135)

microsoft · Nov 9, 2021 · 6eea58c · 6eea58c
1 parent d9b47f3
commit 6eea58c
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
@@ -9,9 +9,8 @@ vcpkg_from_github(
     HEAD_REF stable
 )
 
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
+vcpkg_cmake_configure(
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DHPX_WITH_VCPKG=ON
         -DHPX_WITH_TESTS=OFF
@@ -20,10 +19,10 @@ vcpkg_configure_cmake(
         -DHPX_WITH_RUNTIME=OFF
 )
 
-vcpkg_install_cmake()
+vcpkg_cmake_install()
 
 # post build cleanup
-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/HPX)
 
 file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")
 foreach(CMAKE_FILE IN LISTS CMAKE_FILES)
@@ -50,39 +49,39 @@ vcpkg_replace_string(
     "list(APPEND CMAKE_MODULE_PATH")
 
 file(INSTALL
-    ${SOURCE_PATH}/LICENSE_1_0.txt
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+    "${SOURCE_PATH}/LICENSE_1_0.txt"
+    DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
 
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)
+file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/*.dll")
 if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
+    file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin")
     file(REMOVE ${DLLS})
 endif()
 
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
+file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll")
 if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
+    file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/bin/hpx")
     file(REMOVE ${DLLS})
 endif()
 
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
+file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/*.dll")
 if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
+    file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin")
     file(REMOVE ${DLLS})
 endif()
 
-file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
+file(GLOB DLLS "${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll")
 if(DLLS)
-    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
+    file(COPY ${DLLS} DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/hpx")
     file(REMOVE ${DLLS})
 endif()
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/pkgconfig)
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
+file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
+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__)))")
 
 vcpkg_copy_pdbs()
diff --git a/ports/hpx/vcpkg.json b/ports/hpx/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "hpx",
   "version-semver": "1.7.1",
+  "port-version": 1,
   "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."
@@ -22,6 +23,14 @@
     "boost-throw-exception",
     "boost-variant",
     "boost-winapi",
-    "hwloc"
+    "hwloc",
+    {
+      "name": "vcpkg-cmake",
+      "host": true
+    },
+    {
+      "name": "vcpkg-cmake-config",
+      "host": true
+    }
   ]
 }
diff --git a/versions/baseline.json b/versions/baseline.json
@@ -2686,7 +2686,7 @@
     },
     "hpx": {
       "baseline": "1.7.1",
-      "port-version": 0
+      "port-version": 1
     },
     "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": "739c83940b3bc753e7b1ada7192dd0c36970c9f5",
+      "version-semver": "1.7.1",
+      "port-version": 1
+    },
     {
       "git-tree": "d55f05944b91ea48152696beb48444cad53ba8e1",
       "version-semver": "1.7.1",