diff options
| author | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2020-02-28 23:38:07 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-28 21:38:07 -0800 |
| commit | 8d4b4baf433fcf23e3356cf0e1001708f32ab4c8 (patch) | |
| tree | 5efa9ee8ff51d74cd338dd748d4e890474ceb494 | |
| parent | 605957fef2e0a3f225f9b57ed4d06c2c9e000e9c (diff) | |
| download | vcpkg-8d4b4baf433fcf23e3356cf0e1001708f32ab4c8.tar.gz vcpkg-8d4b4baf433fcf23e3356cf0e1001708f32ab4c8.zip | |
[hpx] Update to V1.4.1 (#10214)
* Updating for HPX V1.4.1
* Addressing review comments
| -rw-r--r-- | ports/hpx/CONTROL | 2 | ||||
| -rw-r--r-- | ports/hpx/portfile.cmake | 13 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index 296efc1bf..f98540c70 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx
-Version: 1.4.0-1
+Version: 1.4.1
Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-bimap, boost-config, boost-context, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-iostreams, boost-lockfree, boost-program-options, boost-range, boost-spirit, boost-system, boost-throw-exception, boost-variant, boost-winapi
Homepage: https://github.com/STEllAR-GROUP/hpx
Description: The C++ Standards Library for Concurrency and Parallelism
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake index 69f619f27..cabab3b8f 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -4,8 +4,8 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO STEllAR-GROUP/hpx - REF 1.4.0 - SHA512 501dbea384f8daa725f752f78198ba8af7b41bf0da432655fb0eaf588ccb1cec40528e28c6dc898230090d04e3dd2c50f7cadd753a13d15b51cea0ac881c3ffd + REF 1.4.1 + SHA512 f110d5e5c10ec396f6e762568c9ecd5b767cb6efe91168b5caa8fe1e07bb5870cd13b3392fa4e008a2cc0e044b02084a35b0866e943d9b9c7435599c131f1582 HEAD_REF stable ) @@ -41,13 +41,14 @@ foreach(CMAKE_FILE IN LISTS CMAKE_FILES) file(WRITE ${CMAKE_FILE} "${_contents}") endforeach() -file(READ "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" _contents) -string(REPLACE "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}/../../lib/cmake/HPX\")" "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")" _contents "${_contents}") -file(WRITE "${CURRENT_PACKAGES_DIR}/share/hpx/HPXMacros.cmake" "${_contents}") +vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/share/${PORT}/HPXMacros.cmake" + "set(CMAKE_MODULE_PATH \${CMAKE_MODULE_PATH} \"\${CMAKE_CURRENT_LIST_DIR}\")" + "list(APPEND CMAKE_MODULE_PATH \"\${CMAKE_CURRENT_LIST_DIR}\")") file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt - DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright) + DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll) if(DLLS) |