Skip to content

Commit

Permalink
Merge pull request #13 from JohanMabille/cpp17
Browse files Browse the repository at this point in the history
Upgraded to xwidgets 0.28.1 and build with cpp17
  • Loading branch information
JohanMabille committed Feb 10, 2024
2 parents 9c1a512 + b7c5b2c commit 2f324e2
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 6 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,6 @@ jobs:
-D CMAKE_CXX_COMPILER=$CXX
make install -j ${{ steps.cpu-cores.outputs.count }}
- name: Run tests
run: pytest .
# TODO: enable this agian when xeus-cpp is available
# - name: Run tests
# run: pytest .
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@ macro(xcanvas_create_target target_name linkage output_name)

set_target_properties(${target_name} PROPERTIES
CXX_EXTENSIONS OFF
CXX_STANDARD_REQUIRED 14)
CXX_STANDARD_REQUIRED 17)

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

if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
target_compile_options(${target_name} PUBLIC -Wunused-parameter -Wextra -Wreorder)
Expand Down
5 changes: 3 additions & 2 deletions environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ dependencies:
- cmake
- cxx-compiler
- xproperty
- xwidgets
- xwidgets >=0.28.1
- ipycanvas >=0.11.0,<0.12
- pytest
- nbval
- xeus-cling
# TODO: replace xeus-cling with xeus(cpp when it is available
#- xeus-cling

0 comments on commit 2f324e2

Please sign in to comment.