3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-31 05:03:22 +08:00
Code Issues Projects Releases Wiki Activity

Adding another patch enabling to build HPX if UNICODE is set

Browse Source
This commit is contained in:
Hartmut Kaiser 2017-05-22 16:29:09 -05:00
parent 3b55cb0754
commit 633d52348b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/hpx/CONTROL
View File

@ -1,5 +1,5 @@
Source: hpx Source: hpx
Version: 1.0.0 Version: 1.0.0-3
Build-Depends: boost, hwloc Build-Depends: boost, hwloc
Description: The C++ Standards Library for Concurrency and Parallelism 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. 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.

16
ports/hpx/portfile.cmake
View File

@ -1,8 +1,9 @@
include(vcpkg_common_functions) include(vcpkg_common_functions)
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
message(FATAL_ERROR "HPX can be built with dynamic linking only") message(STATUS "Warning: Static building of HPX not supported yet. Building dynamic.")
endif() set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hpx_1.0.0) 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}) 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(BOOST_PATH "${CURRENT_INSTALLED_DIR}/share/boost")
SET(HWLOC_PATH "${CURRENT_INSTALLED_DIR}/share/hwloc") SET(HWLOC_PATH "${CURRENT_INSTALLED_DIR}/share/hwloc")