Skip to content

Commit

Permalink
Merge pull request #115 from JohanMabille/cpp17
Browse files Browse the repository at this point in the history
Upgraded to xeus-zmq 1.3.0 and CMakeLists.txt cleanup
  • Loading branch information
JohanMabille committed Feb 9, 2024
2 parents fdb8927 + 3bf7269 commit 6a7109a
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions CMakeLists.txt
Expand Up @@ -140,6 +140,7 @@ set(
macro(xeus_octave_set_common_options target_name)
xeus_octave_target_add_compile_warnings(${target_name})

target_compile_features(${target_name} PRIVATE cxx_std_17)
if(
CMAKE_CXX_COMPILER_ID MATCHES "Clang"
OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
Expand All @@ -154,7 +155,6 @@ macro(xeus_octave_set_common_options target_name)
target_compile_options(${target_name} PUBLIC -march=native)
endif()

target_compile_features(${target_name} PRIVATE cxx_std_17)
endif()

if(APPLE)
Expand Down Expand Up @@ -217,7 +217,6 @@ macro(xeus_octave_create_target target_name linkage output_name)
PUBLIC "XEUS_OCTAVE_EXPORTS"
PRIVATE XEUS_OCTAVE_OVERRIDE_PATH="${CMAKE_INSTALL_PREFIX}/share/xeus-octave"
)
target_compile_features(${target_name} PRIVATE cxx_std_17)

target_include_directories(
${target_name}
Expand Down Expand Up @@ -271,7 +270,6 @@ endif()
# =======
if(XEUS_OCTAVE_BUILD_EXECUTABLE)
add_executable(xoctave ${XEUS_OCTAVE_MAIN_SRC})
target_compile_features(xoctave PRIVATE cxx_std_17)
xeus_octave_set_common_options(xoctave)
xeus_octave_set_kernel_options(xoctave)
endif()
Expand Down
2 changes: 1 addition & 1 deletion environment-dev.yml
Expand Up @@ -10,7 +10,7 @@ dependencies:
# Host dependencies
- libuuid
- xtl
- xeus-zmq =1.*
- xeus-zmq >=1.3.0,<2
- nlohmann_json
- cppzmq
- octave =8.*
Expand Down

0 comments on commit 6a7109a

Please sign in to comment.