Using vcpkg_from_github() for HPX (#2830)

This commit is contained in:
Hartmut Kaiser 2018-02-17 19:32:19 -06:00 committed by Robert Schumacher
parent 12b30c0f88
commit d4004c8ac9
2 changed files with 51 additions and 46 deletions

View File

@ -1,5 +1,5 @@
Source: hpx
Version: 1.0.0-7
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.

View File

@ -5,44 +5,45 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
set(VCPKG_LIBRARY_LINKAGE dynamic)
endif()
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/hpx_1.0.0)
vcpkg_download_distfile(ARCHIVE
URLS "http://stellar-group.org/files/hpx_1.0.0.tar.gz"
FILENAME "hpx_1.0.0.tar.gz"
SHA512 42c155654f118bff34b48d929b1732fd56126b8fd3e7657b5bd2f84275288ddf538572ed1152883c4aed5e9683de53b9b1f1c3613e5092e7bd1a5e165bed606d
)
vcpkg_extract_source_archive(${ARCHIVE})
# 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
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO STEllAR-GROUP/hpx
REF 1.0.0
SHA512 1bb985ad8ab031a7ac034d4597a8bd26eae83fba5aed207c444211954079e10e2d5d83965a1f4ce52d1b29ecc72586c561b984c2c628673a262c07214fd1abb5
HEAD_REF master
)
# 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
)
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 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
)
# 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
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES
${DIFF1}
${DIFF2}
${DIFF3}
${CMAKE_CURRENT_LIST_DIR}/boost-1-66.patch
)
# 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")
@ -64,7 +65,11 @@ vcpkg_configure_cmake(
vcpkg_install_cmake()
# post build cleanup
file(RENAME ${CURRENT_PACKAGES_DIR}/share/hpx-1.0.0 ${CURRENT_PACKAGES_DIR}/share/hpx)
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
@ -72,32 +77,32 @@ file(INSTALL
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})
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})
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})
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})
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})
file(COPY ${__hpx_dll} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin/hpx)
file(REMOVE ${__hpx_dll})
endforeach()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/bazel)