Skip to content

Bump to 0.15.0 #104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 6, 2022
Merged

Bump to 0.15.0 #104

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
82ade56
bump to 0.15.0
blink1073 Dec 2, 2022
e1a66e7
use xeus zmq
blink1073 Dec 2, 2022
f8602b5
Bump to xeus-zmq 1.0.2
JohanMabille Dec 5, 2022
de635bc
Updated to xeus 3.0.3
JohanMabille Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 28 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ set(ZEROMQ_GIT_TAG v4.3.2)
set(CPPZMQ_GIT_TAG v4.7.1)
set(XTL_GIT_TAG 0.7.2)
set(JSON_GIT_TAG v3.7.3)
set(XEUS_GIT_TAG 2.4.1)
set(XEUS_GIT_TAG 3.0.3)
set(XEUS_ZMQ_GIT_TAG 1.0.2)
set(PYBIND11_GIT_TAG v2.10.0)
set(PYBIND11_JSON_GIT_TAG 0.2.11)
set(XEUS_PYTHON_GIT_TAG 0.14.3)
set(XEUS_PYTHON_GIT_TAG 0.15.0)

# pre-build non-cmake dependencies
# ================================
Expand Down Expand Up @@ -82,6 +83,7 @@ endif()

include(FetchContent)


# LibZMQ
# ------

Expand Down Expand Up @@ -170,12 +172,12 @@ if(NOT xtl_POPULATED)
add_subdirectory(${xtl_SOURCE_DIR} ${xtl_BINARY_DIR})
endif()


# Xeus
# ----

message(STATUS "Fetching xeus")

set(XEUS_DISABLE_ARCH_NATIVE ON CACHE BOOL "remove -march=native flag" FORCE)
set(XEUS_STATIC_DEPENDENCIES ON CACHE BOOL "links with static libraries" FORCE)
set(XEUS_BUILD_SHARED_LIBS OFF CACHE BOOL "Do not build xeus shared object" FORCE)
set(XEUS_BUILD_STATIC_LIBS ON CACHE BOOL "Build xeus static library" FORCE)
Expand All @@ -193,6 +195,29 @@ if(NOT xeus_POPULATED)
add_subdirectory(${xeus_SOURCE_DIR} ${xeus_BINARY_DIR})
endif()


# Xeus Zmq
# --------

message(STATUS "Fetching xeus zmq")

set(XEUS_ZMQ_STATIC_DEPENDENCIES ON CACHE BOOL "links with static libraries" FORCE)
set(XEUS_ZMQ_BUILD_SHARED_LIBS OFF CACHE BOOL "Do not build xeus shared object" FORCE)
set(XEUS_ZMQ_BUILD_STATIC_LIBS ON CACHE BOOL "Build xeus static library" FORCE)

FetchContent_Declare(
xeus_zmq
GIT_REPOSITORY https://github.com/jupyter-xeus/xeus-zmq
GIT_TAG ${XEUS_ZMQ_GIT_TAG}
)

FetchContent_GetProperties(xeus_zmq)

if(NOT xeus_zmq_POPULATED)
FetchContent_Populate(xeus_zmq)
add_subdirectory(${xeus_zmq_SOURCE_DIR} ${xeus_zmq_BINARY_DIR})
endif()

# Pybind11
# --------

Expand Down