Skip to content

Commit

Permalink
Merge pull request #30 from JohanMabille/xeus_dep
Browse files Browse the repository at this point in the history
Updated required xeus version
  • Loading branch information
JohanMabille authored Jul 11, 2023
2 parents 8e00550 + 4743dc2 commit 952119f
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ foreach(ver ${xeus_zmq_version_defines})
endforeach()
set(XEUS_ZMQ_VERSION
${XEUS_ZMQ_VERSION_MAJOR}.${XEUS_ZMQ_VERSION_MINOR}.${XEUS_ZMQ_VERSION_PATCH})
message(STATUS "xeus version: v${XEUS_ZMQ_VERSION}")
message(STATUS "xeus-zmq version: v${XEUS_ZMQ_VERSION}")

# Binary version
# See the following URL for explanations about the binary versionning
Expand All @@ -42,7 +42,7 @@ foreach(ver ${xeus_zmq_version_defines})
endforeach()
set(XEUS_ZMQ_BINARY_VERSION
${XEUS_ZMQ_BINARY_CURRENT}.${XEUS_ZMQ_BINARY_REVISION}.${XEUS_ZMQ_BINARY_AGE})
message(STATUS "xeus binary version: v${XEUS_ZMQ_BINARY_VERSION}")
message(STATUS "xeus-zmq binary version: v${XEUS_ZMQ_BINARY_VERSION}")

# Build options
# =============
Expand Down Expand Up @@ -79,7 +79,7 @@ message(STATUS "XEUS_ZMQ_BUILD_TESTS: ${XEUS_ZMQ_BUILD_TESTS}")
# Dependencies
# ============

set(xeus_REQUIRED_VERSION 3.0.0)
set(xeus_REQUIRED_VERSION 3.1.1)
set(nlohmann_json_REQUIRED_VERSION 3.2.0)
set(cppzmq_REQUIRED_VERSION 4.8.1)
set(zeromq_REQUIRED_VERSION 4.3.2)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ See the [documentation](http://xeus.readthedocs.io/) for an exhaustive list of t
| xeus-zmq | xeus | ZeroMQ | cppzmq | nlohmann json | OpenSSL | xtl |
|----------|---------|---------|---------|---------------|---------|----------------|
| master | ^3.0.0 | ^4.2.5 | ^4.8.1 | ^3.2.0 | ^3.0 | >=0.7.0,<0.8.0 |
| master | ^3.1.1 | ^4.2.5 | ^4.8.1 | ^3.2.0 | ^3.0 | >=0.7.0,<0.8.0 |
| 1.x | ^3.0.0 | ^4.2.5 | ^4.8.1 | ^3.2.0 | ^3.0 | >=0.7.0,<0.8.0 |
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ dependencies:
- zeromq-static=4.3.4
- cppzmq=4.8.1
- xtl=0.7
- xeus>=3.0,<4.0
- xeus>=3.1.1,<4.0
- OpenSSL=1
- libopenssl-static=1
- nlohmann_json
Expand Down

0 comments on commit 952119f

Please sign in to comment.