Skip to content

Commit a8cf6cd

Browse files
committed
feat: Fix some errors when compiling on Ubuntu:22.04
1 parent 6eeaa26 commit a8cf6cd

File tree

4 files changed

+7
-2
lines changed

4 files changed

+7
-2
lines changed

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ LABEL org.opencontainers.image.source https://github.com/4paradigm/OpenMLDB
2424
COPY ./*.sh /
2525

2626
RUN apt update -y && \
27-
apt install -y build-essential python3-dev openjdk-11-jdk flex doxygen lcov git && \
27+
apt install -y build-essential python3-dev openjdk-11-jdk flex doxygen lcov git curl && \
2828
apt clean cache && \
2929
curl -Lo zookeeper.tar.gz https://archive.apache.org/dist/zookeeper/zookeeper-3.4.14/zookeeper-3.4.14.tar.gz && \
3030
mkdir -p /deps/src && \

src/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,10 @@ function(compile_lib LIB_NAME DIR DEPEND_FILE_LIST)
5656
set(FILE_STR_LIST "${FILE_STR_LIST} ${DEPEND_FILE_LIST}")
5757
string(REPLACE " " ";" FILE_LIST ${FILE_STR_LIST})
5858
add_library(${LIB_NAME} STATIC ${FILE_LIST} $<TARGET_OBJECTS:openmldb_proto>)
59+
target_compile_options(${LIB_NAME} PRIVATE
60+
$<$<COMPILE_LANGUAGE:CXX>:-Wno-error=nonnull>
61+
$<$<COMPILE_LANGUAGE:C>:-Wno-error=nonnull>
62+
)
5963
endfunction(compile_lib)
6064

6165
set(TEST_LIBS

src/client/ns_client.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <algorithm>
2323
#include <map>
2424
#include <memory>
25+
#include <optional>
2526
#include <set>
2627
#include <string>
2728
#include <vector>

third-party/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ set(MAKEOPTS "$ENV{MAKEOPTS}" CACHE STRING "Extra options to make")
7676
message(STATUS "Install bundled dependencies into ${DEPS_INSTALL_DIR}")
7777

7878
set(HYBRIDSQL_ASSERTS_HOME https://github.com/4paradigm/hybridsql-asserts)
79-
set(HYBRIDSQL_ASSERTS_VERSION 0.7.0)
79+
set(HYBRIDSQL_ASSERTS_VERSION 0.7.1)
8080

8181
function(get_linux_lsb_release_information)
8282
execute_process(COMMAND bash ${CMAKE_SOURCE_DIR}/get-lsb-release.sh

0 commit comments

Comments
 (0)