Updating HPX to V1.1 (#3120)

* Updating HPX to V1.1

* [hpx] Use vcpkg_fixup_cmake_targets

3 files changed, 99 insertions, 162 deletions

diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL
index 471b64986..ff6801a42 100644
--- a/ports/hpx/CONTROL
+++ b/ports/hpx/CONTROL
@@ -1,5 +1,5 @@
-Source: hpx
-Version: 1.0.0-8
-Build-Depends: hwloc, boost-chrono, boost-date-time, boost-filesystem, boost-program-options, boost-regex, boost-system, boost-thread, boost-context, boost-iostreams, boost-random, boost-atomic, boost-asio, boost-dynamic-bitset, boost-assign, boost-format, boost-signals2, boost-parameter, boost-bimap, boost-accumulators, boost-lockfree, boost-icl
-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.
+Source: hpx

+Version: 1.1.0-1

+Build-Depends: hwloc, boost-accumulators, boost-algorithm, boost-asio, boost-assign, boost-atomic, boost-bimap, boost-chrono, boost-config, boost-context, boost-date-time, boost-dynamic-bitset, boost-exception, boost-filesystem, boost-format, boost-iostreams, boost-lockfree, boost-parameter, boost-program-options, boost-range, boost-regex, boost-signals2, boost-smart-ptr, boost-spirit, boost-system, boost-thread, boost-throw-exception, boost-variant, boost-winapi

+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/ports/hpx/boost-1-66.patch b/ports/hpx/boost-1-66.patch
deleted file mode 100644
index 6f98a48aa..000000000
--- a/ports/hpx/boost-1-66.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/src/util/asio_util.cpp b/src/util/asio_util.cpp
-index e2207de..48a35b9 100644
---- a/src/util/asio_util.cpp
-+++ b/src/util/asio_util.cpp
-@@ -231,7 +231,7 @@ namespace hpx { namespace util
-             tcp::endpoint ep;
-             if (util::get_endpoint(address, port, ep))
-             {
--                return endpoint_iterator_type(tcp::resolver::iterator::create(
-+                return endpoint_iterator_type(tcp::resolver::results_type::create(
-                     ep, address, port_str));
-             }
-         }
-@@ -283,7 +283,7 @@ namespace hpx { namespace util
-             if (util::get_endpoint(address, port, ep))
-             {
-                 return endpoint_iterator_type(
--                    tcp::resolver::iterator::create(ep, address, port_str));
-+                    tcp::resolver::results_type::create(ep, address, port_str));
-             }
-         }
-         catch (boost::system::system_error const&) {
-diff --git a/src/util/serialize_exception.cpp b/src/util/serialize_exception.cpp
-index 935e575..22bcf37 100644
---- a/src/util/serialize_exception.cpp
-+++ b/src/util/serialize_exception.cpp
-@@ -341,11 +341,7 @@ namespace hpx { namespace serialization
-         case hpx::util::boost_system_error:
-             e = hpx::detail::construct_exception(
-                     boost::system::system_error(err_value,
--#ifndef BOOST_SYSTEM_NO_DEPRECATED
--                        boost::system::get_system_category()
--#else
-                         boost::system::system_category()
--#endif
-                       , err_message
-                     )
-                   , throw_function_, throw_file_, throw_line_, throw_back_trace_,
diff --git a/ports/hpx/portfile.cmake b/ports/hpx/portfile.cmake
index e03d566e8..c200a6278 100644
--- a/ports/hpx/portfile.cmake
+++ b/ports/hpx/portfile.cmake
@@ -1,119 +1,94 @@
-include(vcpkg_common_functions)
-
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)                                          
-    message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.") 
-    set(VCPKG_LIBRARY_LINKAGE dynamic)                                              
-endif()                                                                             
-
-vcpkg_from_github(
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO STEllAR-GROUP/hpx
-    REF 1.0.0
-    SHA512 1bb985ad8ab031a7ac034d4597a8bd26eae83fba5aed207c444211954079e10e2d5d83965a1f4ce52d1b29ecc72586c561b984c2c628673a262c07214fd1abb5
-    HEAD_REF master
-)
-
-if(NOT VCPKG_USE_HEAD_VERSION)
-    # apply hotfix to enable building with vcpkg
-    vcpkg_download_distfile(DIFF1
-        URLS "http://stellar-group.org/files/hpx-Build-system-changes-to-make-HPX-compile-when-built-with-vcpkg.diff"
-        FILENAME "hpx-Build-system-changes-to-make-HPX-compile-when-built-with-vcpkg.diff"
-        SHA512 86df311a120686139955e1c0fdca55379594be3fa8d46d69ee59d83da351ce3bed487ab946c80f7127aab9699e470e24e545b112f92be9f971f41d95c429d01d
-    )
-
-    # apply hotfix to fix issues with building 32bit version
-    vcpkg_download_distfile(DIFF2
-        URLS "http://stellar-group.org/files/hpx-Fixing-32bit-MSVC-compilation.diff"
-        FILENAME "hpx-Fixing-32bit-MSVC-compilation.diff"
-        SHA512 31c904d317b4c24eddd819e4856f8326ff3850a5a196c7648c46a11dbb85f35e972e077957b3c4aec67c8b043816fe1cebc92cfe28ed815f682537dfc3421b8b
-    )
-
-    # apply hotfix to fix issues when building with UNICODE enabled
-    vcpkg_download_distfile(DIFF3
-        URLS "http://stellar-group.org/files/hpx-Making-sure-UNICODE-on-Windows-does-not-break-by-default.diff"
-        FILENAME "hpx-Making-sure-UNICODE-on-Windows-does-not-break-by-default.diff"
-        SHA512 8fcdb36307702d64b9d2b26920374a6c5a29a50d125305dc95926c4cbc91215cb0c72ede83b06d0fc007fe7b2283845e08351bd45f11f3677f0d3db4ac8f9424
-    )
-
-    vcpkg_apply_patches(
-        SOURCE_PATH ${SOURCE_PATH}
-        PATCHES
-            ${DIFF1}
-            ${DIFF2}
-            ${DIFF3}
-            ${CMAKE_CURRENT_LIST_DIR}/boost-1-66.patch
-    )
-endif()
-
-SET(BOOST_PATH "${CURRENT_INSTALLED_DIR}/share/boost")
-SET(HWLOC_PATH "${CURRENT_INSTALLED_DIR}/share/hwloc")
-
-vcpkg_configure_cmake(
-    SOURCE_PATH ${SOURCE_PATH}
-    PREFER_NINJA
-    OPTIONS
-        -DBOOST_ROOT=${BOOST_PATH}
-        -DHWLOC_ROOT=${HWLOC_ROOT}
-        -DHPX_WITH_VCPKG=ON
-        -DHPX_WITH_HWLOC=ON
-        -DHPX_WITH_TESTS=OFF
-        -DHPX_WITH_EXAMPLES=OFF
-        -DHPX_WITH_TOOLS=OFF
-        -DHPX_WITH_RUNTIME=OFF
-)
-
-vcpkg_install_cmake()
-
-# post build cleanup
-if(NOT VCPKG_USE_HEAD_VERSION)
-    file(RENAME ${CURRENT_PACKAGES_DIR}/share/hpx-1.0.0 ${CURRENT_PACKAGES_DIR}/share/hpx)
-else()
-    file(RENAME ${CURRENT_PACKAGES_DIR}/share/hpx-1.1.0 ${CURRENT_PACKAGES_DIR}/share/hpx)
-endif()
-
-file(INSTALL
-    ${SOURCE_PATH}/LICENSE_1_0.txt
-    DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)
-
-file(GLOB __hpx_cmakes ${CURRENT_PACKAGES_DIR}/lib/cmake/HPX/*.*)
-foreach(__hpx_cmake ${__hpx_cmakes})
-    file(COPY ${__hpx_cmake} DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx/cmake)
-    file(REMOVE ${__hpx_cmake})
-endforeach()
-
-file(GLOB __hpx_dlls ${CURRENT_PACKAGES_DIR}/lib/*.dll)
-foreach(__hpx_dll ${__hpx_dlls})
-    file(COPY ${__hpx_dll} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
-    file(REMOVE ${__hpx_dll})
-endforeach()
-
-file(GLOB __hpx_dlls ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)
-foreach(__hpx_dll ${__hpx_dlls})
-    file(COPY ${__hpx_dll} DESTINATION ${CURRENT_PACKAGES_DIR}/bin/hpx)
-    file(REMOVE ${__hpx_dll})
-endforeach()
-
-file(GLOB __hpx_dlls ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)
-foreach(__hpx_dll ${__hpx_dlls})
-    file(COPY ${__hpx_dll} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
-    file(REMOVE ${__hpx_dll})
-endforeach()
-
-file(GLOB __hpx_dlls ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)
-foreach(__hpx_dll ${__hpx_dlls})
-    file(COPY ${__hpx_dll} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
-    file(REMOVE ${__hpx_dll})
-endforeach()
-
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)
-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/lib/bazel)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)
-
-vcpkg_copy_pdbs()
-
+include(vcpkg_common_functions)

+

+if (VCPKG_LIBRARY_LINKAGE STREQUAL static)

+    message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.") 

+    set(VCPKG_LIBRARY_LINKAGE dynamic)

+endif()

+

+vcpkg_from_github(

+    OUT_SOURCE_PATH SOURCE_PATH

+    REPO STEllAR-GROUP/hpx

+    REF 1.1.0

+    SHA512 435250143ddbd2608995fe3dc5c229a096312d7ac930925ae56d0abd2d5689886126f6e81bc7e37b84ca9bc99f951ef1f39580168a359c48788ac8d008bc7078

+    HEAD_REF master

+)

+

+vcpkg_configure_cmake(

+    SOURCE_PATH ${SOURCE_PATH}

+    PREFER_NINJA

+    OPTIONS

+        "-DBOOST_ROOT=${CURRENT_INSTALLED_DIR}/share/boost"

+        "-DHWLOC_ROOT=${CURRENT_INSTALLED_DIR}/share/hwloc"

+        -DHPX_WITH_VCPKG=ON

+        -DHPX_WITH_HWLOC=ON

+        -DHPX_WITH_TESTS=OFF

+        -DHPX_WITH_EXAMPLES=OFF

+        -DHPX_WITH_TOOLS=OFF

+        -DHPX_WITH_RUNTIME=OFF

+)

+

+vcpkg_install_cmake()

+

+# post build cleanup

+file(GLOB SHARE_DIR ${CURRENT_PACKAGES_DIR}/share/hpx-*)

+file(RENAME ${SHARE_DIR} ${CURRENT_PACKAGES_DIR}/share/hpx)

+

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/HPX)

+

+file(GLOB_RECURSE CMAKE_FILES "${CURRENT_PACKAGES_DIR}/share/hpx/*.cmake")

+foreach(CMAKE_FILE IN LISTS CMAKE_FILES)

+    file(READ ${CMAKE_FILE} _contents)

+    string(REGEX REPLACE

+        "lib/([A-Za-z0-9_.-]+\\.dll)"

+        "bin/\\1"

+        _contents "${_contents}")

+    string(REGEX REPLACE

+        "lib/hpx/([A-Za-z0-9_.-]+\\.dll)"

+        "bin/\\1"

+        _contents "${_contents}")

+    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}")

+

+file(INSTALL

+    ${SOURCE_PATH}/LICENSE_1_0.txt

+    DESTINATION ${CURRENT_PACKAGES_DIR}/share/hpx RENAME copyright)

+

+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/*.dll)

+if(DLLS)

+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

+    file(REMOVE ${DLLS})

+endif()

+

+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/lib/hpx/*.dll)

+if(DLLS)

+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/bin)

+    file(REMOVE ${DLLS})

+endif()

+

+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/*.dll)

+if(DLLS)

+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

+    file(REMOVE ${DLLS})

+endif()

+

+file(GLOB DLLS ${CURRENT_PACKAGES_DIR}/debug/lib/hpx/*.dll)

+if(DLLS)

+    file(COPY ${DLLS} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)

+    file(REMOVE ${DLLS})

+endif()

+

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)

+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/lib/bazel)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)

+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig)

+

+vcpkg_copy_pdbs()