[flux] Update to version 0.4.0 (#42027)

This commit is contained in:
Sidney Cogdill 2024-11-11 08:27:54 +00:00 committed by GitHub
parent c892a5d7ff
commit 6840264010
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 9 additions and 39 deletions

View File

@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO tcbrindle/flux
REF 1c128b50af95fc39b6683d437f9210239e219836
SHA512 c07d3053227d6a62f5a7b0aba8535c0ed42195249d131a77989b3ee79a697f8d540b68639dcd9e89b5cdd76ee5d7f07db9b3be23bc325761c85af625f507e393
REF "v${VERSION}"
SHA512 ac6f373d2b6b7f568528ba489aa0b1785ce9e25ba1c75ec23a3a7b517d54534491be0f808a09778e651791e61cc4bf407b8c18ff6aa53af4ae7cd9b518a8df43
HEAD_REF master
PATCHES
targets-fixup.patch
)
set(VCPKG_BUILD_TYPE release) # header-only port

View File

@ -1,33 +0,0 @@
diff --git i/CMakeLists.txt w/CMakeLists.txt
index e87b3c7..c6239f0 100644
--- i/CMakeLists.txt
+++ w/CMakeLists.txt
@@ -118,4 +118,27 @@ install(
DIRECTORY "${PROJECT_SOURCE_DIR}/include"
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/.."
PATTERN "build2file" EXCLUDE
-)
+)
+
+#
+# Removes the INTERFACE_SOURCES flux::flux property in the flux-targets.cmake
+# file that is there only because of the poor interaction of the
+# $<BUILD_INTERFACE:...> with the install(TARGETS...) command. The generator
+# creates an empty string instead of no string and the install(TARGETS...)
+# takes that empty string as a indication that the code should put the source
+# path in as a source file list (why?).
+#
+# The code here gets inserted into near the end of the cmake_install.cmake
+# file. It reads the flux-targets.cmake file into memory, clears the file,
+# then recreates the file skipping the line that contains the malformed
+# INTERFACE_SOURCES property value.
+#
+set(FLUX_TARGETS_FILE "${CMAKE_INSTALL_PREFIX}/lib/cmake/flux/flux-targets.cmake")
+install(CODE
+ "file (STRINGS \"${FLUX_TARGETS_FILE}\" FLUX_TARGETS_FILE_LINES)
+ file(WRITE \"${FLUX_TARGETS_FILE}\" \"\")
+ foreach(FLUX_TARGETS_FILE_LINE IN LISTS FLUX_TARGETS_FILE_LINES)
+ if (NOT FLUX_TARGETS_FILE_LINE MATCHES \"^[ \t]*INTERFACE_SOURCES[ \t].*$\")
+ file(APPEND \"${FLUX_TARGETS_FILE}\" \"\${FLUX_TARGETS_FILE_LINE}\\n\")
+ endif()
+ endforeach()")

View File

@ -1,6 +1,6 @@
{
"name": "flux",
"version-date": "2023-08-25",
"version": "0.4.0",
"description": "Experimental C++20 library that provides a broadly equivalent feature set to C++20 Ranges, but uses a slightly different model based around cursors rather than iterators. Safer, easier, more efficient, compatible.",
"homepage": "https://github.com/tcbrindle/flux",
"dependencies": [

View File

@ -2841,7 +2841,7 @@
"port-version": 0
},
"flux": {
"baseline": "2023-08-25",
"baseline": "0.4.0",
"port-version": 0
},
"fmem": {

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "f116a561b078c42d622ad8bce61e4e33dc2b0121",
"version": "0.4.0",
"port-version": 0
},
{
"git-tree": "3be6cb846e140bc6b745f684bbd4141cae6c4dbd",
"version-date": "2023-08-25",