🔧 build(fix aarch64 warning): ignore compile warning
This commit is contained in:
4
deps/linenoise/CMakeLists.txt
vendored
4
deps/linenoise/CMakeLists.txt
vendored
@@ -1,2 +1,4 @@
|
||||
add_library(linenoise STATIC linenoise.c)
|
||||
target_include_directories(linenoise PUBLIC ${CMAKE_CURRENT_LIST_DIR})
|
||||
target_include_directories(linenoise PUBLIC ${CMAKE_CURRENT_LIST_DIR})
|
||||
|
||||
target_compile_options(linenoise PRIVATE -Wno-error=type-limits)
|
||||
@@ -8,7 +8,6 @@ target_link_libraries(
|
||||
gtest_exdata
|
||||
exdata
|
||||
gtest
|
||||
gmock
|
||||
)
|
||||
|
||||
include(GoogleTest)
|
||||
|
||||
@@ -11,7 +11,6 @@ target_link_libraries(
|
||||
dl
|
||||
"-rdynamic"
|
||||
gtest
|
||||
gmock
|
||||
)
|
||||
|
||||
include(GoogleTest)
|
||||
|
||||
@@ -243,7 +243,7 @@ extern "C"
|
||||
struct timeval time_now;
|
||||
struct stm_stat *stat;
|
||||
struct stm_spinlock *lock; // for dynamic register command, conn_close_cb
|
||||
int (*gettime_cb)(struct timeval *tv, struct timezone *tz);
|
||||
int (*gettime_cb)(struct timeval *tv, void *tz);
|
||||
struct monitor_connection current_conn;
|
||||
struct stm_pktdump_runtime *packet_dump;
|
||||
|
||||
@@ -282,7 +282,7 @@ extern "C"
|
||||
/************************************************************************************************************/
|
||||
/* monitor call gettimeofday(2) by default */
|
||||
struct stellar_monitor_config *stellar_monitor_config_new(const char *toml);
|
||||
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz));
|
||||
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz));
|
||||
struct stellar_monitor *stellar_monitor_get(void);
|
||||
struct stm_connection_manager *stm_connection_insert(struct evhttp_connection *evconn);
|
||||
void stm_connection_update(struct stm_connection_manager *conn_mgr, const struct evhttp_connection *evconn);
|
||||
|
||||
@@ -194,7 +194,7 @@ static void stm_server_set_default_cfg(struct stellar_monitor_config *config)
|
||||
config->output_interval_ms = STM_STAT_OUTPUT_INTERVAL_MS;
|
||||
}
|
||||
|
||||
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, struct timezone *tz))
|
||||
int stellar_monitor_set_gettime_callback(struct stellar_monitor *stm, int (*gettime_cb)(struct timeval *tv, void *tz))
|
||||
{
|
||||
if (NULL == gettime_cb)
|
||||
{
|
||||
|
||||
@@ -405,6 +405,8 @@ static inline uint16_t gre0_hdr_get_offset(const struct gre0_hdr *hdr)
|
||||
}
|
||||
}
|
||||
|
||||
#pragma GCC diagnostic warning "-Warray-bounds"
|
||||
|
||||
static inline uint32_t gre0_hdr_get_key(const struct gre0_hdr *hdr)
|
||||
{
|
||||
if (gre0_hdr_get_key_flag(hdr))
|
||||
|
||||
@@ -6,7 +6,7 @@ target_include_directories(gtest_lpip PRIVATE ${CMAKE_SOURCE_DIR}/decoders/)
|
||||
target_link_libraries(
|
||||
gtest_lpip PRIVATE stellar_lib cjson-static
|
||||
dl "-rdynamic"
|
||||
gtest gmock
|
||||
gtest
|
||||
)
|
||||
|
||||
#target_link_libraries(gtest_lpi PRIVATE -Wl,--whole-archive lpi -Wl,--no-whole-archive)
|
||||
|
||||
@@ -10,6 +10,7 @@ set (STELLAR-DUMP-PATCH-FILE ${CMAKE_SOURCE_DIR}/tools/monitor/stellar-dump.patc
|
||||
set (STELLAR-DUMP-PATCH-CMD ${CMAKE_SOURCE_DIR}/tools/monitor/stellar-dump-update.sh)
|
||||
ExternalProject_Add(tcpdump PREFIX tcpdump
|
||||
URL ${CMAKE_SOURCE_DIR}/vendors/tcpdump-4.99.4.tar.gz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 4f2d4a8a5fab017e5ebda156bfc86378
|
||||
PATCH_COMMAND sh -c "chmod +x ${STELLAR-DUMP-PATCH-CMD} && ${STELLAR-DUMP-PATCH-CMD} ${CMAKE_CURRENT_BINARY_DIR}/tcpdump/src/tcpdump ${STELLAR-DUMP-PATCH-FILE}"
|
||||
CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_CRYPTO=OFF -DSTELLAR_SOURCE_DIR=${CMAKE_SOURCE_DIR} -DSTELLAR_BINARY_DIR=${CMAKE_BINARY_DIR} -DASAN_OPTION=${ASAN_OPTION}
|
||||
|
||||
27
vendors/CMakeLists.txt
vendored
27
vendors/CMakeLists.txt
vendored
@@ -1,32 +1,26 @@
|
||||
include(ExternalProject)
|
||||
|
||||
# GoogleTest
|
||||
ExternalProject_Add(googletest
|
||||
PREFIX googletest
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.8.0.tar.gz
|
||||
URL_MD5 16877098823401d1bf2ed7891d7dce36
|
||||
CMAKE_ARGS
|
||||
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
|
||||
-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
|
||||
)
|
||||
ExternalProject_Add(googletest PREFIX googletest
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/googletest-release-1.10.0.tgz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 ad777f4af22026493ea2782c611b8809
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=RELWITHDEBINFO
|
||||
BUILD_IN_SOURCE 1
|
||||
BUILD_COMMAND make)
|
||||
|
||||
ExternalProject_Get_Property(googletest INSTALL_DIR)
|
||||
file(MAKE_DIRECTORY ${INSTALL_DIR}/include)
|
||||
|
||||
add_library(gtest STATIC IMPORTED GLOBAL)
|
||||
add_dependencies(gtest googletest)
|
||||
set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgtest.a)
|
||||
set_property(TARGET gtest PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib64/libgtest.a)
|
||||
set_property(TARGET gtest PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
|
||||
set_property(TARGET gtest PROPERTY INTERFACE_LINK_LIBRARIES pthread)
|
||||
|
||||
add_library(gmock STATIC IMPORTED GLOBAL)
|
||||
add_dependencies(gmock googletest)
|
||||
set_property(TARGET gmock PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib/libgmock.a)
|
||||
set_property(TARGET gmock PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTALL_DIR}/include)
|
||||
|
||||
#libcjson-1.7.17
|
||||
ExternalProject_Add(cjson PREFIX cjson
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/libcjson_v1.7.17.tar.gz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 4b2ab12cf065c079004aa44495ade04a
|
||||
CONFIGURE_COMMAND ""
|
||||
BUILD_COMMAND make
|
||||
@@ -45,6 +39,7 @@ set_property(TARGET cjson-static PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${INSTAL
|
||||
#llhttp-9.1.3
|
||||
ExternalProject_Add(llhttp PREFIX llhttp
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/llhttp-release-v9.2.1.tar.gz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 355ecc90e622035e3e1693a96a0c233b
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DBUILD_STATIC_LIBS=ON -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DCMAKE_C_FLAGS="-fPIC")
|
||||
ExternalProject_Get_Property(llhttp INSTALL_DIR)
|
||||
@@ -60,6 +55,7 @@ set_property(TARGET llhttp-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/lib
|
||||
#brotli-v1.0.9
|
||||
ExternalProject_Add(brotli PREFIX brotli
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/brotli-v1.0.9.tar.gz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 c2274f0c7af8470ad514637c35bcee7d
|
||||
CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE})
|
||||
ExternalProject_Get_Property(brotli INSTALL_DIR)
|
||||
@@ -84,6 +80,7 @@ set_property(TARGET brotli-enc-static PROPERTY IMPORTED_LOCATION ${INSTALL_DIR}/
|
||||
ExternalProject_Add(libevent
|
||||
PREFIX libevent
|
||||
URL ${CMAKE_CURRENT_SOURCE_DIR}/libevent-2.1.12-stable.tar.gz
|
||||
DOWNLOAD_EXTRACT_TIMESTAMP ON
|
||||
URL_MD5 b5333f021f880fe76490d8a799cd79f4
|
||||
CMAKE_ARGS -DEVENT__DISABLE_OPENSSL=ON -DEVENT__DISABLE_BENCHMARK=ON -DBUILD_TESTING=OFF -DEVENT__DISABLE_TESTS=ON -DEVENT__LIBRARY_TYPE=BOTH -DCMAKE_C_FLAGS="-fPIC"
|
||||
-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
|
||||
|
||||
BIN
vendors/googletest-release-1.10.0.tgz
vendored
Normal file
BIN
vendors/googletest-release-1.10.0.tgz
vendored
Normal file
Binary file not shown.
BIN
vendors/googletest-release-1.8.0.tar.gz
vendored
BIN
vendors/googletest-release-1.8.0.tar.gz
vendored
Binary file not shown.
Reference in New Issue
Block a user