Skip to content

Commit 40418e6

Browse files
authored
Merge pull request #35 from JohanMabille/cpp17
Upgraded to xeus 3.2.0 and build with cpp17
2 parents 46bc274 + 2081a57 commit 40418e6

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

CMakeLists.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ message(STATUS "XEUS_ZMQ_BUILD_TESTS: ${XEUS_ZMQ_BUILD_TESTS}")
7979
# Dependencies
8080
# ============
8181

82-
set(xeus_REQUIRED_VERSION 3.1.1)
82+
set(xeus_REQUIRED_VERSION 3.2.0)
8383
set(nlohmann_json_REQUIRED_VERSION 3.2.0)
8484
set(cppzmq_REQUIRED_VERSION 4.8.1)
8585
set(zeromq_REQUIRED_VERSION 4.3.2)
@@ -249,7 +249,7 @@ macro(xeus_zmq_create_target target_name linkage output_name)
249249
# Compilation flags
250250
# =================
251251

252-
target_compile_features(${target_name} PRIVATE cxx_std_14)
252+
target_compile_features(${target_name} PRIVATE cxx_std_17)
253253

254254
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR
255255
CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR

environment-dev.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ dependencies:
1212
- zeromq-static=4.3.4
1313
- cppzmq=4.8.1
1414
- xtl=0.7
15-
- xeus>=3.1.1,<4.0
15+
- xeus>=3.2.0,<4.0
1616
- OpenSSL=1
1717
- libopenssl-static=1
1818
- nlohmann_json

0 commit comments

Comments
 (0)