diff options
| author | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2017-05-22 16:29:09 -0500 |
|---|---|---|
| committer | Hartmut Kaiser <hartmut.kaiser@gmail.com> | 2017-05-23 07:59:44 -0500 |
| commit | 633d52348b249299e68ec4328ea9a25f1c8640eb (patch) | |
| tree | 5fec57a74c8d4e75279907f2b2002f77089b7002 | |
| parent | 3b55cb075437f03259b386a0d62db935d08e569b (diff) | |
| download | vcpkg-633d52348b249299e68ec4328ea9a25f1c8640eb.tar.gz vcpkg-633d52348b249299e68ec4328ea9a25f1c8640eb.zip | |
Adding another patch enabling to build HPX if UNICODE is set
| -rw-r--r-- | ports/hpx/CONTROL | 2 | ||||
| -rw-r--r-- | ports/hpx/portfile.cmake | 16 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ports/hpx/CONTROL b/ports/hpx/CONTROL index e6bfb7e1e..c1433102a 100644 --- a/ports/hpx/CONTROL +++ b/ports/hpx/CONTROL @@ -1,5 +1,5 @@ Source: hpx -Version: 1.0.0 +Version: 1.0.0-3 Build-Depends: boost, hwloc 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/portfile.cmake b/ports/hpx/portfile.cmake index d051d8084..3c51bb13b 100644 --- a/ports/hpx/portfile.cmake +++ b/ports/hpx/portfile.cmake @@ -1,8 +1,9 @@ include(vcpkg_common_functions) -if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) - message(FATAL_ERROR "HPX can be built with dynamic linking only") -endif() +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.") + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hpx_1.0.0) @@ -29,6 +30,15 @@ vcpkg_download_distfile(DIFF ) vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF}) +# apply hotfix to fix issues when building with UNICODE enabled +vcpkg_download_distfile(DIFF + URLS "http://stellar-group.org/files/Making-sure-UNICODE-on-Windows-does-not-break-by-default.diff" + FILENAME "Making-sure-UNICODE-on-Windows-does-not-break-by-default.diff" + SHA512 8fcdb36307702d64b9d2b26920374a6c5a29a50d125305dc95926c4cbc91215cb0c72ede83b06d0fc007fe7b2283845e08351bd45f11f3677f0d3db4ac8f9424 +) +vcpkg_apply_patches(SOURCE_PATH ${SOURCE_PATH} PATCHES ${DIFF}) + + SET(BOOST_PATH "${CURRENT_INSTALLED_DIR}/share/boost") SET(HWLOC_PATH "${CURRENT_INSTALLED_DIR}/share/hwloc") |