- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [x] SHA512s are updated for each updated download.
- [x] The "supports" clause reflects platforms that may be fixed by this
new version.
- [x] Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.
- [x] Any patches that are no longer applied are deleted from the port's
directory.
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
This commit is contained in:
Hartmut Kaiser 2024-05-30 01:41:15 -05:00 коммит произвёл GitHub
Родитель aba6a348e3
Коммит 37630acd98
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
7 изменённых файлов: 9 добавлений и 66 удалений

Просмотреть файл

@ -1,21 +0,0 @@
diff --git a/cmake/HPX_CompilerFlagsTargets.cmake b/cmake/HPX_CompilerFlagsTargets.cmake
index 5bf4649..0912503 100644
--- a/cmake/HPX_CompilerFlagsTargets.cmake
+++ b/cmake/HPX_CompilerFlagsTargets.cmake
@@ -15,14 +15,8 @@ target_compile_features(hpx_public_flags INTERFACE cxx_std_${HPX_CXX_STANDARD})
# Set other flags that should always be set
-# HPX_DEBUG must be set without a generator expression as it determines ABI
-# compatibility. Projects in Release mode using HPX in Debug mode must have
-# HPX_DEBUG set, and projects in Debug mode using HPX in Release mode must not
-# have HPX_DEBUG set. HPX_DEBUG must also not be set by projects using HPX.
-if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
- target_compile_definitions(hpx_private_flags INTERFACE HPX_DEBUG)
- target_compile_definitions(hpx_public_flags INTERFACE HPX_DEBUG)
-endif()
+target_compile_definitions(hpx_private_flags INTERFACE $<$<CONFIG:DEBUG>:HPX_DEBUG>)
+target_compile_definitions(hpx_public_flags INTERFACE $<$<CONFIG:DEBUG>:HPX_DEBUG>)
target_compile_definitions(
hpx_private_flags

Просмотреть файл

@ -1,15 +0,0 @@
diff --git a/cmake/FindHwloc.cmake b/cmake/FindHwloc.cmake
index cdede78..6967abf 100644
--- a/cmake/FindHwloc.cmake
+++ b/cmake/FindHwloc.cmake
@@ -71,6 +71,9 @@ if(NOT TARGET Hwloc::hwloc)
add_library(Hwloc::hwloc INTERFACE IMPORTED)
target_include_directories(Hwloc::hwloc SYSTEM INTERFACE ${HWLOC_INCLUDE_DIR})
target_link_libraries(Hwloc::hwloc INTERFACE ${HWLOC_LIBRARIES})
-
+ if(APPLE)
+ target_link_libraries(Hwloc::hwloc INTERFACE "-framework CoreFoundation" "-framework IOKit")
+ endif()
+
mark_as_advanced(HWLOC_ROOT HWLOC_LIBRARY HWLOC_INCLUDE_DIR)
endif()

Просмотреть файл

@ -1,13 +0,0 @@
diff --git a/cmake/HPX_AddComponent.cmake b/cmake/HPX_AddComponent.cmake
index 129a87ced..b45feb3f5 100644
--- a/cmake/HPX_AddComponent.cmake
+++ b/cmake/HPX_AddComponent.cmake
@@ -306,7 +306,7 @@ function(add_hpx_component name)
hpx_setup_target(
${name}_component
TYPE COMPONENT
- NAME ${name}
+ NAME ${name}_component
FOLDER ${${name}_FOLDER}
COMPILE_FLAGS ${${name}_COMPILE_FLAGS}
LINK_FLAGS ${${name}_LINK_FLAGS}

Просмотреть файл

@ -3,24 +3,12 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" HPX_WITH_STATIC_LINKING)
vcpkg_download_distfile(
MSVC_STATIC_VARIABLES_PATCH
URLS https://github.com/STEllAR-GROUP/hpx/commit/6c378813a7e2304a3a0c8900156f147a3a44b0cb.patch?full_index=1
SHA512 6ed2ec4eab9593d8d1a76da183dd4ceb5ac332f50b0b5cd3a81c74248c61eeb869d301a33e266d06c5f8ddf041da6cd29d1b89b38e51527716a6e557b4a7e66e
FILENAME hpx-6c378813a7e2304a3a0c8900156f147a3a44b0cb.patch
)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO STEllAR-GROUP/hpx
REF "v${VERSION}"
SHA512 a7972beada950cf6ef3b61f20496a08b220e4f48c28c11d57c20683906ca5124a9f36ac2552318883a5ab1db6efdbf63d1141b6e0c484c560a8c1311ae2d7090
SHA512 e1cc9fa72cba4e66b5d6eff2487e93d5d553c32e6eebcfe9131bf69c5b595ab72295ff0986c81d5dc6a7caa8303d6709df91333f64efe59ee256d99a8c289dc5
HEAD_REF master
PATCHES
fix-dependency-hwloc.patch
fix-debug.patch
fix_output_name_clash.patch
"${MSVC_STATIC_VARIABLES_PATCH}"
)
vcpkg_check_features(

Просмотреть файл

@ -1,7 +1,6 @@
{
"name": "hpx",
"version": "1.9.1",
"port-version": 1,
"version": "1.10.0",
"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."

Просмотреть файл

@ -3441,8 +3441,8 @@
"port-version": 0
},
"hpx": {
"baseline": "1.9.1",
"port-version": 1
"baseline": "1.10.0",
"port-version": 0
},
"http-parser": {
"baseline": "2.9.4",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "16c5c4ecb6757b7217dedd324cc1e86e9d5694e1",
"version": "1.10.0",
"port-version": 0
},
{
"git-tree": "f2a5820cd03a2049446ae18d5e98f99ae6eb7fa7",
"version": "1.9.1",