Skip to content

Commit 5bcd1ef

Browse files
committed
Repaced xeus-zmq dependecy with xeus for xeus-lua libarary
1 parent 8675cd5 commit 5bcd1ef

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

CMakeLists.txt

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,7 @@ endif()
8080
# ============
8181

8282
set(xtl_REQUIRED_VERSION 0.7.0)
83-
set(xeus-zmq_REQUIRED_VERSION 1.0.0)
84-
83+
set(xeus_REQUIRED_VERSION 3.0.0)
8584
set(xwidgets_REQUIRED_VERSION 0.27.0)
8685
set(xcanvas_REQUIRED_VERSION 0.3.0)
8786
set(xproperty_REQUIRED_VERSION 0.11.0)
@@ -90,8 +89,8 @@ set(Lua_REQUIRED_VERSION 5.3.4)
9089
if (NOT TARGET xtl)
9190
find_package(xtl ${xtl_REQUIRED_VERSION} REQUIRED)
9291
endif ()
93-
if (NOT TARGET xeus-zmq AND NOT TARGET xeus-zmq-static)
94-
find_package(xeus-zmq ${xeus-zmq_REQUIRED_VERSION} REQUIRED)
92+
if (NOT TARGET xeus AND NOT TARGET xeus-static)
93+
find_package(xeus ${xeus_REQUIRED_VERSION} REQUIRED)
9594
endif ()
9695

9796
if(NOT XEUS_LUA_USE_LUAJIT)
@@ -147,9 +146,6 @@ endif()
147146

148147
if(XLUA_WITH_XCANVAS)
149148
add_compile_definitions(XLUA_WITH_XCANVAS)
150-
endif()
151-
152-
if(XLUA_WITH_XCANVAS)
153149
if (NOT TARGET xcanvas)
154150
find_package(xcanvas REQUIRED)
155151
endif ()
@@ -300,9 +296,9 @@ macro(xeus_lua_create_target target_name linkage output_name)
300296
$<INSTALL_INTERFACE:include>)
301297

302298
if (XEUS_LUA_USE_SHARED_XEUS)
303-
set(XEUS_LUA_XEUS_TARGET xeus-zmq)
299+
set(XEUS_LUA_XEUS_TARGET xeus)
304300
else ()
305-
set(XEUS_LUA_XEUS_TARGET xeus-zmq-static)
301+
set(XEUS_LUA_XEUS_TARGET xeus-static)
306302
endif ()
307303

308304
if(XLUA_WITH_XWIDGETS OR XLUA_WITH_XCANVAS)
@@ -372,10 +368,12 @@ endif ()
372368
# xeus-lua
373369
# =======
374370
if (XEUS_LUA_BUILD_EXECUTABLE)
371+
find_package(xeus-zmq 1.0.1 REQUIRED)
375372
add_executable(xlua ${XEUS_LUA_MAIN_SRC})
376373
target_compile_features(xlua PRIVATE cxx_std_17)
377374
xeus_lua_set_common_options(xlua)
378375
xeus_lua_set_kernel_options(xlua)
376+
target_link_libraries(xlua PRIVATE xeus-zmq)
379377
endif()
380378

381379
if(XEUS_LUA_EMSCRIPTEN_WASM_BUILD)

0 commit comments

Comments
 (0)