Skip to content

Commit b0581ec

Browse files
committed
build: Address Robin-map vs CMake 4.0 compatibility (#4701)
* Raise auto-build version of Robinmap to 1.4. * Add the magic CMAKE_POLICY_VERSION_MINIMUM to our auto-build of Robinmap in case an older version is selected for auto-build. (Mimicking the fix we did for other packages.) * Add Robin-map to the INSTALL.md list of dependencies, somehow it had been overlooked before. Signed-off-by: Larry Gritz <lg@larrygritz.com>
1 parent 148bb8a commit b0581ec

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

INSTALL.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.
2929
* **[fmtlib](https://github.com/fmtlib/fmt) >= 7.0** (tested through 11.1).
3030
If not found at build time, this will be automatically downloaded unless
3131
the build sets `-DBUILD_MISSING_FMT=OFF`.
32+
* [Robin-map](https://github.com/Tessil/robin-map) (unknown minimum, tested
33+
through 1.4, which is the recommended version). If not found at build time,
34+
this will be automatically downloaded unless the build sets
35+
`-DBUILD_MISSING_FMT=OFF`.
3236

3337
### Optional dependencies -- features may be disabled if not found
3438
* If you are building the `iv` viewer (which will be disabled if any of

src/cmake/build_Robinmap.cmake

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,18 @@
66
# Robinmap by hand!
77
######################################################################
88

9-
set_cache (Robinmap_BUILD_VERSION 1.3.0 "Robinmap version for local builds")
9+
set_cache (Robinmap_BUILD_VERSION 1.4.0 "Robinmap version for local builds")
1010
set (Robinmap_GIT_REPOSITORY "https://github.com/Tessil/robin-map")
1111
set (Robinmap_GIT_TAG "v${Robinmap_BUILD_VERSION}")
1212

1313
build_dependency_with_cmake(Robinmap
1414
VERSION ${Robinmap_BUILD_VERSION}
1515
GIT_REPOSITORY ${Robinmap_GIT_REPOSITORY}
1616
GIT_TAG ${Robinmap_GIT_TAG}
17-
# CMAKE_ARGS
17+
CMAKE_ARGS
18+
# Fix for pybind11 breaking against cmake 4.0.
19+
# Remove when pybind11 is fixed to declare its own minimum high enough.
20+
-D CMAKE_POLICY_VERSION_MINIMUM=3.5
1821
)
1922

2023
# Set some things up that we'll need for a subsequent find_package to work

0 commit comments

Comments
 (0)