forked from exaloop/codon
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathxeus.patch
77 lines (68 loc) · 3.35 KB
/
xeus.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
From 1b87a6fc56a5965066581decd40d0fced324ec1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ibrahim=20Numanagic=CC=81?= <ibrahim@exaloop.io>
Date: Thu, 20 Apr 2023 11:22:56 -0700
Subject: [PATCH] Codon fixes
---
CMakeLists.txt | 13 ++++++++-----
src/xserver.cpp | 3 ---
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53330ba..af02f69 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,6 +53,7 @@ option(XEUS_BUILD_SHARED_LIBS "Build xeus shared library." ON)
option(XEUS_BUILD_STATIC_LIBS "Build xeus static library (default if BUILD_SHARED_LIBS is OFF)." ON)
option(XEUS_STATIC_DEPENDENCIES "link statically with xeus dependencies" OFF)
option(XEUS_EMSCRIPTEN_WASM_BUILD "build for wasm via emscripten" OFF)
+option(XEUS_USE_DYNAMIC_UUID "use dynamic linking for libuuid" OFF)
# Test options
option(XEUS_BUILD_TESTS "xeus test suite" OFF)
@@ -70,9 +71,10 @@ endif()
message(STATUS "XEUS_BUILD_SHARED_LIBS: ${XEUS_BUILD_SHARED_LIBS}")
message(STATUS "XEUS_BUILD_STATIC_LIBS: ${XEUS_BUILD_STATIC_LIBS}")
-message(STATUS "XEUS_STATIC_DEPENDENCIES: ${XEUS_STATIC_DEPENDENCIES}")
+message(STATUS "XEUS_STATIC_DEPENDENCIES: ${XEUS_STATIC_DEPENDENCIES}")
message(STATUS "XEUS_EMSCRIPTEN_WASM_BUILD: ${XEUS_EMSCRIPTEN_WASM_BUILD}")
-message(STATUS "XEUS_BUILD_TESTS: ${XEUS_BUILD_TESTS}")
+message(STATUS "XEUS_BUILD_TESTS: ${XEUS_BUILD_TESTS}")
+message(STATUS "XEUS_USE_DYNAMIC_UUID: ${XEUS_USE_DYNAMIC_UUID}")
# Dependencies
# ============
@@ -170,12 +172,14 @@ macro(xeus_create_target target_name linkage output_name)
if (APPLE)
target_link_libraries(${target_name} PUBLIC "-framework CoreFoundation")
else ()
- if (XEUS_STATIC_DEPENDENCIES)
+ if ((NOT XEUS_USE_DYNAMIC_UUID) AND (XEUS_STATIC_DEPENDENCIES))
+ message(STATUS "static libuuid linking")
find_path(LIBUUID_INCLUDE_DIR uuid/uuid.h)
find_library(LIBUUID_LIBRARY libuuid.a)
target_include_directories(${target_name} PRIVATE ${LIBUUID_INCLUDE_DIR})
- target_link_libraries(${target_name} PRIVATE ${LIBUUID_LIBRARY})
+ target_link_libraries(${target_name} PRIVATE ${LIBUUID_LIBRARY})
else ()
+ message(STATUS "dynamic libuuid linking")
find_package(LibUUID REQUIRED)
target_link_libraries(${target_name} PRIVATE LibUUID::LibUUID)
endif ()
@@ -220,7 +224,6 @@ macro(xeus_create_target target_name linkage output_name)
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)
message(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
endif()
diff --git a/src/xserver.cpp b/src/xserver.cpp
index 82acb78..04caa3b 100644
--- a/src/xserver.cpp
+++ b/src/xserver.cpp
@@ -40,9 +40,6 @@ namespace xeus
void xserver::start(xpub_message message)
{
- std::clog << "Run with XEUS " << XEUS_VERSION_MAJOR << "."
- << XEUS_VERSION_MINOR << "."
- << XEUS_VERSION_PATCH << std::endl;
start_impl(std::move(message));
}
--
2.40.0