Skip to content

Commit

Permalink
Merge pull request #402 from JohanMabille/remove_xtl
Browse files Browse the repository at this point in the history
Removed dependency on xtl
  • Loading branch information
JohanMabille authored May 27, 2024
2 parents cfe45eb + 11c56d5 commit 2aa695b
Show file tree
Hide file tree
Showing 14 changed files with 4,166 additions and 17 deletions.
9 changes: 2 additions & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -81,28 +81,24 @@ message(STATUS "XEUS_BUILD_TESTS: ${XEUS_BUILD_TESTS}")
# search # directly for nlohmann_json, but rely on find_dependency called by
# find_package(xeus) instead.
set(nlohmann_json_REQUIRED_VERSION 3.11)
set(xtl_REQUIRED_VERSION 0.7)

if (NOT TARGET nlohmann_json)
find_package(nlohmann_json ${nlohmann_json_REQUIRED_VERSION} REQUIRED)
message(STATUS "Found nlohmann_json ${nlohmann_json_VERSION}")
endif ()

if (NOT TARGET xtl)
find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
message(STATUS "Found xl ${xtl_VERSION}")
endif ()

# Source files
# ============

set(XEUS_HEADERS
${XEUS_INCLUDE_DIR}/xeus/xbasic_fixed_string.hpp
${XEUS_INCLUDE_DIR}/xeus/xcomm.hpp
${XEUS_INCLUDE_DIR}/xeus/xcontrol_messenger.hpp
${XEUS_INCLUDE_DIR}/xeus/xdebugger.hpp
${XEUS_INCLUDE_DIR}/xeus/xeus.hpp
${XEUS_INCLUDE_DIR}/xeus/xeus_context.hpp
${XEUS_INCLUDE_DIR}/xeus/xguid.hpp
${XEUS_INCLUDE_DIR}/xeus/xhash.hpp
${XEUS_INCLUDE_DIR}/xeus/xhistory_manager.hpp
${XEUS_INCLUDE_DIR}/xeus/xinput.hpp
${XEUS_INCLUDE_DIR}/xeus/xinterpreter.hpp
Expand Down Expand Up @@ -175,7 +171,6 @@ macro(xeus_create_target target_name linkage output_name)
target_link_libraries(
${target_name}
PUBLIC nlohmann_json::nlohmann_json
PUBLIC xtl
)

if (NOT MSVC AND NOT EMSCRIPTEN)
Expand Down
1 change: 0 additions & 1 deletion environment-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ dependencies:
- ninja
- pkg-config
# Host dependencies
- xtl=0.7
- nlohmann_json
# Test dependencies
- doctest >= 2.4.6
1 change: 0 additions & 1 deletion environment-wasm-host.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ channels:
- https://repo.mamba.pm/emscripten-forge
- https://repo.mamba.pm/conda-forge
dependencies:
- xtl
- nlohmann_json

Loading

0 comments on commit 2aa695b

Please sign in to comment.