mirror of
https://github.com/VCMP-SqMod/SqMod.git
synced 2025-06-27 20:47:11 +02:00
Update WIP discord and some vendors.
CPR has features disabled and PCRE is fully disabled until updated to new code.
This commit is contained in:
Sandu Liviu Catalin
@ -194,13 +194,14 @@ macro(zmq_check_tcp_tipc)
|
||||
int main(int argc, char *argv [])
|
||||
{
|
||||
struct sockaddr_tipc topsrv;
|
||||
int sd = socket(AF_TIPC, SOCK_SEQPACKET, 0);
|
||||
int sd = socket(PF_TIPC, SOCK_SEQPACKET, 0);
|
||||
memset(&topsrv, 0, sizeof(topsrv));
|
||||
topsrv.family = AF_TIPC;
|
||||
topsrv.addrtype = TIPC_ADDR_NAME;
|
||||
topsrv.addr.name.name.type = TIPC_TOP_SRV;
|
||||
topsrv.addr.name.name.instance = TIPC_TOP_SRV;
|
||||
fcntl(sd, F_SETFL, O_NONBLOCK);
|
||||
tipc_addr(0, 0, 0);
|
||||
}
|
||||
"
|
||||
ZMQ_HAVE_TIPC)
|
||||
@ -211,7 +212,7 @@ macro(zmq_check_pthread_setname)
|
||||
message(STATUS "Checking pthread_setname signature")
|
||||
set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||
set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
|
||||
check_c_source_runs(
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <pthread.h>
|
||||
|
||||
@ -222,7 +223,7 @@ int main(int argc, char *argv [])
|
||||
}
|
||||
"
|
||||
ZMQ_HAVE_PTHREAD_SETNAME_1)
|
||||
check_c_source_runs(
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <pthread.h>
|
||||
|
||||
@ -233,7 +234,7 @@ int main(int argc, char *argv [])
|
||||
}
|
||||
"
|
||||
ZMQ_HAVE_PTHREAD_SETNAME_2)
|
||||
check_c_source_runs(
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <pthread.h>
|
||||
|
||||
@ -244,7 +245,7 @@ int main(int argc, char *argv [])
|
||||
}
|
||||
"
|
||||
ZMQ_HAVE_PTHREAD_SETNAME_3)
|
||||
check_c_source_runs(
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <pthread.h>
|
||||
|
||||
@ -262,7 +263,7 @@ macro(zmq_check_pthread_setaffinity)
|
||||
message(STATUS "Checking pthread_setaffinity signature")
|
||||
set(SAVE_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
|
||||
set(CMAKE_REQUIRED_FLAGS "-D_GNU_SOURCE -Werror -pthread")
|
||||
check_c_source_runs(
|
||||
check_c_source_compiles(
|
||||
"
|
||||
#include <pthread.h>
|
||||
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
################################################################################
|
||||
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
|
||||
# Please refer to the README for information about making permanent changes. #
|
||||
################################################################################
|
||||
|
||||
if (NOT MSVC)
|
||||
find_package(PkgConfig REQUIRED)
|
||||
pkg_check_modules(PC_SODIUM "libsodium")
|
||||
if (PC_SODIUM_FOUND)
|
||||
set(pkg_config_names_private "${pkg_config_names_private} libsodium")
|
||||
endif()
|
||||
if (NOT PC_SODIUM_FOUND)
|
||||
pkg_check_modules(PC_SODIUM "sodium")
|
||||
if (PC_SODIUM_FOUND)
|
||||
set(pkg_config_names_private "${pkg_config_names_private} sodium")
|
||||
endif()
|
||||
endif (NOT PC_SODIUM_FOUND)
|
||||
if (PC_SODIUM_FOUND)
|
||||
set(SODIUM_INCLUDE_HINTS ${PC_SODIUM_INCLUDE_DIRS} ${PC_SODIUM_INCLUDE_DIRS}/*)
|
||||
set(SODIUM_LIBRARY_HINTS ${PC_SODIUM_LIBRARY_DIRS} ${PC_SODIUM_LIBRARY_DIRS}/*)
|
||||
else()
|
||||
set(pkg_config_libs_private "${pkg_config_libs_private} -lsodium")
|
||||
endif()
|
||||
endif (NOT MSVC)
|
||||
|
||||
# some libraries install the headers is a subdirectory of the include dir
|
||||
# returned by pkg-config, so use a wildcard match to improve chances of finding
|
||||
# headers and libraries.
|
||||
find_path(
|
||||
SODIUM_INCLUDE_DIRS
|
||||
NAMES sodium.h
|
||||
HINTS ${SODIUM_INCLUDE_HINTS}
|
||||
)
|
||||
|
||||
find_library(
|
||||
SODIUM_LIBRARIES
|
||||
NAMES libsodium sodium
|
||||
HINTS ${SODIUM_LIBRARY_HINTS}
|
||||
)
|
||||
|
||||
include(FindPackageHandleStandardArgs)
|
||||
find_package_handle_standard_args(sodium DEFAULT_MSG SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
|
||||
mark_as_advanced(SODIUM_FOUND SODIUM_LIBRARIES SODIUM_INCLUDE_DIRS)
|
||||
|
||||
################################################################################
|
||||
# THIS FILE IS 100% GENERATED BY ZPROJECT; DO NOT EDIT EXCEPT EXPERIMENTALLY #
|
||||
# Please refer to the README for information about making permanent changes. #
|
||||
################################################################################
|
||||
4
vendor/ZMQ/builds/cmake/NSIS.template32.in
vendored
4
vendor/ZMQ/builds/cmake/NSIS.template32.in
vendored
@ -851,7 +851,7 @@ Section "Uninstall"
|
||||
@CPACK_NSIS_DELETE_ICONS@
|
||||
@CPACK_NSIS_DELETE_ICONS_EXTRA@
|
||||
|
||||
;Delete empty start menu parent diretories
|
||||
;Delete empty start menu parent directories
|
||||
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
|
||||
|
||||
startMenuDeleteLoop:
|
||||
@ -870,7 +870,7 @@ Section "Uninstall"
|
||||
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
|
||||
@CPACK_NSIS_DELETE_ICONS_EXTRA@
|
||||
|
||||
;Delete empty start menu parent diretories
|
||||
;Delete empty start menu parent directories
|
||||
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
|
||||
|
||||
secondStartMenuDeleteLoop:
|
||||
|
||||
4
vendor/ZMQ/builds/cmake/NSIS.template64.in
vendored
4
vendor/ZMQ/builds/cmake/NSIS.template64.in
vendored
@ -854,7 +854,7 @@ Section "Uninstall"
|
||||
@CPACK_NSIS_DELETE_ICONS@
|
||||
@CPACK_NSIS_DELETE_ICONS_EXTRA@
|
||||
|
||||
;Delete empty start menu parent diretories
|
||||
;Delete empty start menu parent directories
|
||||
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
|
||||
|
||||
startMenuDeleteLoop:
|
||||
@ -873,7 +873,7 @@ Section "Uninstall"
|
||||
Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
|
||||
@CPACK_NSIS_DELETE_ICONS_EXTRA@
|
||||
|
||||
;Delete empty start menu parent diretories
|
||||
;Delete empty start menu parent directories
|
||||
StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
|
||||
|
||||
secondStartMenuDeleteLoop:
|
||||
|
||||
12
vendor/ZMQ/builds/cmake/ci_build.sh
vendored
12
vendor/ZMQ/builds/cmake/ci_build.sh
vendored
@ -31,6 +31,7 @@ CMAKE_OPTS+=("-DCMAKE_PREFIX_PATH:PATH=${BUILD_PREFIX}")
|
||||
CMAKE_OPTS+=("-DCMAKE_LIBRARY_PATH:PATH=${BUILD_PREFIX}/lib")
|
||||
CMAKE_OPTS+=("-DCMAKE_INCLUDE_PATH:PATH=${BUILD_PREFIX}/include")
|
||||
CMAKE_OPTS+=("-DENABLE_CAPSH=ON")
|
||||
CMAKE_OPTS+=("-DBUILD_TESTS=ON")
|
||||
|
||||
if [ "$CLANG_FORMAT" != "" ] ; then
|
||||
CMAKE_OPTS+=("-DCLANG_FORMAT=${CLANG_FORMAT}")
|
||||
@ -43,7 +44,7 @@ elif [ $CURVE == "libsodium" ]; then
|
||||
|
||||
if ! ((command -v dpkg-query >/dev/null 2>&1 && dpkg-query --list libsodium-dev >/dev/null 2>&1) || \
|
||||
(command -v brew >/dev/null 2>&1 && brew ls --versions libsodium >/dev/null 2>&1)); then
|
||||
git clone --depth 1 -b stable git://github.com/jedisct1/libsodium.git
|
||||
git clone --depth 1 -b stable https://github.com/jedisct1/libsodium.git
|
||||
( cd libsodium; ./autogen.sh; ./configure --prefix=$BUILD_PREFIX; make install)
|
||||
fi
|
||||
fi
|
||||
@ -52,6 +53,15 @@ CMAKE_PREFIXES=()
|
||||
MAKE_PREFIXES=()
|
||||
PARALLEL_MAKE_OPT="-j5"
|
||||
if [ -n "$CLANG_TIDY" ] ; then
|
||||
# To allow sonar to process history information, unshallow clone first.
|
||||
git fetch --unshallow
|
||||
curl -L https://sonarcloud.io/static/cpp/build-wrapper-linux-x86.zip -o build-wrapper-linux-x86.zip
|
||||
unzip build-wrapper-linux-x86.zip
|
||||
export SONARCLOUD_BUILD_WRAPPER_PATH="${PWD}/build-wrapper-linux-x86/"
|
||||
curl -L https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.2.0.1873-linux.zip -o sonar-scanner-cli.zip
|
||||
unzip sonar-scanner-cli.zip
|
||||
export SONAR_SCANNER_CLI_PATH="${PWD}/sonar-scanner-4.2.0.1873-linux/bin/"
|
||||
|
||||
CMAKE_OPTS+=("-DCMAKE_BUILD_TYPE=Debug") # do a debug build to avoid unused variable warnings with assertions, and to speed up build
|
||||
CMAKE_OPTS+=("-DCMAKE_CXX_CLANG_TIDY:STRING=${CLANG_TIDY}")
|
||||
if [ -n ${SONARCLOUD_BUILD_WRAPPER_PATH} ] ; then
|
||||
|
||||
7
vendor/ZMQ/builds/cmake/platform.hpp.in
vendored
7
vendor/ZMQ/builds/cmake/platform.hpp.in
vendored
@ -10,8 +10,10 @@
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_EPOLL_CLOEXEC
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_DEVPOLL
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_POLLSET
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_POLL
|
||||
#cmakedefine ZMQ_IOTHREAD_POLLER_USE_SELECT
|
||||
#cmakedefine ZMQ_HAVE_PPOLL
|
||||
|
||||
#cmakedefine ZMQ_POLL_BASED_ON_SELECT
|
||||
#cmakedefine ZMQ_POLL_BASED_ON_POLL
|
||||
@ -58,6 +60,7 @@
|
||||
#cmakedefine ZMQ_HAVE_LIBBSD
|
||||
|
||||
#cmakedefine ZMQ_HAVE_IPC
|
||||
#cmakedefine ZMQ_HAVE_STRUCT_SOCKADDR_UN
|
||||
|
||||
#cmakedefine ZMQ_USE_BUILTIN_SHA1
|
||||
#cmakedefine ZMQ_USE_NSS
|
||||
@ -67,11 +70,11 @@
|
||||
|
||||
#cmakedefine ZMQ_HAVE_OPENPGM
|
||||
#cmakedefine ZMQ_HAVE_NORM
|
||||
#cmakedefine ZMQ_HAVE_VMCI
|
||||
|
||||
#cmakedefine ZMQ_MAKE_VALGRIND_HAPPY
|
||||
|
||||
#cmakedefine ZMQ_BUILD_DRAFT_API
|
||||
#cmakedefine ZMQ_HAVE_CURVE
|
||||
#cmakedefine ZMQ_USE_TWEETNACL
|
||||
#cmakedefine ZMQ_USE_LIBSODIUM
|
||||
#cmakedefine SODIUM_STATIC
|
||||
#cmakedefine ZMQ_USE_GNUTLS
|
||||
|
||||
Reference in New Issue
Block a user