summaryrefslogtreecommitdiff
path: root/deps
diff options
context:
space:
mode:
Diffstat (limited to 'deps')
-rw-r--r--deps/chromium-zlib/CMakeLists.txt12
-rw-r--r--deps/ntlmclient/CMakeLists.txt62
-rw-r--r--deps/ntlmclient/ntlm.h8
-rw-r--r--deps/ntlmclient/ntlmclient.h4
-rw-r--r--deps/pcre/CMakeLists.txt176
-rw-r--r--deps/winhttp/CMakeLists.txt30
6 files changed, 145 insertions, 147 deletions
diff --git a/deps/chromium-zlib/CMakeLists.txt b/deps/chromium-zlib/CMakeLists.txt
index bbb35d4e6..55d67948d 100644
--- a/deps/chromium-zlib/CMakeLists.txt
+++ b/deps/chromium-zlib/CMakeLists.txt
@@ -4,18 +4,18 @@
# TODO: The Chromium build file (in deps/chromium-zlib/zlib/BUILD.gn) supports
# more platforms (like ARM with NEON), more can be enabled as needed.
-CMAKE_MINIMUM_REQUIRED(VERSION 3.11)
+cmake_minimum_required(VERSION 3.11)
include(FetchContent)
include(FindGit)
# Ensure that the git binary is present to download the sources.
find_package(Git)
-IF(NOT Git_FOUND)
+if(NOT Git_FOUND)
message(FATAL_ERROR "git is required to download the Chromium zlib sources")
-ENDIF()
+endif()
-FetchContent_Populate(chromium_zlib_src
+fetchcontent_populate(chromium_zlib_src
GIT_REPOSITORY https://chromium.googlesource.com/chromium/src/third_party/zlib.git
GIT_TAG 2c183c9f93a328bfb3121284da13cf89a0f7e64a
QUIET
@@ -31,8 +31,8 @@ disable_warnings(missing-declarations)
# -O3 is also set by the Chromium configuration and has been deemed safe enough
# for them.
-SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
-SET(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
# Common definitions.
add_definitions(
diff --git a/deps/ntlmclient/CMakeLists.txt b/deps/ntlmclient/CMakeLists.txt
index 3e0d2c817..9c5e23d60 100644
--- a/deps/ntlmclient/CMakeLists.txt
+++ b/deps/ntlmclient/CMakeLists.txt
@@ -1,37 +1,37 @@
-FILE(GLOB SRC_NTLMCLIENT "ntlm.c" "ntlm.h" "util.c" "util.h")
-LIST(SORT SRC_NTLMCLIENT)
+file(GLOB SRC_NTLMCLIENT "ntlm.c" "ntlm.h" "util.c" "util.h")
+list(SORT SRC_NTLMCLIENT)
-ADD_DEFINITIONS(-DNTLM_STATIC=1)
+add_definitions(-DNTLM_STATIC=1)
-DISABLE_WARNINGS(implicit-fallthrough)
+disable_warnings(implicit-fallthrough)
-IF(USE_ICONV)
- ADD_DEFINITIONS(-DUNICODE_ICONV=1)
- FILE(GLOB SRC_NTLMCLIENT_UNICODE "unicode_iconv.c" "unicode_iconv.h")
-ELSE()
- ADD_DEFINITIONS(-DUNICODE_BUILTIN=1)
- FILE(GLOB SRC_NTLMCLIENT_UNICODE "unicode_builtin.c" "unicode_builtin.h")
-ENDIF()
+if(USE_ICONV)
+ add_definitions(-DUNICODE_ICONV=1)
+ file(GLOB SRC_NTLMCLIENT_UNICODE "unicode_iconv.c" "unicode_iconv.h")
+else()
+ add_definitions(-DUNICODE_BUILTIN=1)
+ file(GLOB SRC_NTLMCLIENT_UNICODE "unicode_builtin.c" "unicode_builtin.h")
+endif()
-IF(USE_HTTPS STREQUAL "SecureTransport")
- ADD_DEFINITIONS(-DCRYPT_COMMONCRYPTO)
- SET(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c" "crypt_commoncrypto.h")
+if(USE_HTTPS STREQUAL "SecureTransport")
+ add_definitions(-DCRYPT_COMMONCRYPTO)
+ set(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c" "crypt_commoncrypto.h")
# CC_MD4 has been deprecated in macOS 10.15.
- SET_SOURCE_FILES_PROPERTIES("crypt_commoncrypto.c" COMPILE_FLAGS "-Wno-deprecated")
-ELSEIF(USE_HTTPS STREQUAL "OpenSSL")
- ADD_DEFINITIONS(-DCRYPT_OPENSSL)
- INCLUDE_DIRECTORIES(${OPENSSL_INCLUDE_DIR})
- SET(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
-ELSEIF(USE_HTTPS STREQUAL "OpenSSL-Dynamic")
- ADD_DEFINITIONS(-DCRYPT_OPENSSL)
- ADD_DEFINITIONS(-DCRYPT_OPENSSL_DYNAMIC)
- SET(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
-ELSEIF(USE_HTTPS STREQUAL "mbedTLS")
- ADD_DEFINITIONS(-DCRYPT_MBEDTLS)
- INCLUDE_DIRECTORIES(${MBEDTLS_INCLUDE_DIR})
- SET(SRC_NTLMCLIENT_CRYPTO "crypt_mbedtls.c" "crypt_mbedtls.h")
-ELSE()
- MESSAGE(FATAL_ERROR "Unable to use libgit2's HTTPS backend (${USE_HTTPS}) for NTLM crypto")
-ENDIF()
+ set_source_files_properties("crypt_commoncrypto.c" COMPILE_FLAGS "-Wno-deprecated")
+elseif(USE_HTTPS STREQUAL "OpenSSL")
+ add_definitions(-DCRYPT_OPENSSL)
+ include_directories(${OPENSSL_INCLUDE_DIR})
+ set(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
+elseif(USE_HTTPS STREQUAL "OpenSSL-Dynamic")
+ add_definitions(-DCRYPT_OPENSSL)
+ add_definitions(-DCRYPT_OPENSSL_DYNAMIC)
+ set(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
+elseif(USE_HTTPS STREQUAL "mbedTLS")
+ add_definitions(-DCRYPT_MBEDTLS)
+ include_directories(${MBEDTLS_INCLUDE_DIR})
+ set(SRC_NTLMCLIENT_CRYPTO "crypt_mbedtls.c" "crypt_mbedtls.h")
+else()
+ message(FATAL_ERROR "Unable to use libgit2's HTTPS backend (${USE_HTTPS}) for NTLM crypto")
+endif()
-ADD_LIBRARY(ntlmclient OBJECT ${SRC_NTLMCLIENT} ${SRC_NTLMCLIENT_UNICODE} ${SRC_NTLMCLIENT_CRYPTO})
+add_library(ntlmclient OBJECT ${SRC_NTLMCLIENT} ${SRC_NTLMCLIENT_UNICODE} ${SRC_NTLMCLIENT_CRYPTO})
diff --git a/deps/ntlmclient/ntlm.h b/deps/ntlmclient/ntlm.h
index 227f5bcba..4abfd7a85 100644
--- a/deps/ntlmclient/ntlm.h
+++ b/deps/ntlmclient/ntlm.h
@@ -30,7 +30,7 @@ typedef enum {
NTLM_STATE_CHALLENGE = 1,
NTLM_STATE_RESPONSE = 2,
NTLM_STATE_ERROR = 3,
- NTLM_STATE_COMPLETE = 4,
+ NTLM_STATE_COMPLETE = 4
} ntlm_state;
typedef struct {
@@ -122,7 +122,7 @@ struct ntlm_client {
};
typedef enum {
- NTLM_ENABLE_HOSTVERSION = (1 << 31),
+ NTLM_ENABLE_HOSTVERSION = (1 << 31)
} ntlm_client_internal_flags;
typedef enum {
@@ -130,7 +130,7 @@ typedef enum {
NTLM_TARGET_INFO_SERVER = 1,
NTLM_TARGET_INFO_DOMAIN = 2,
NTLM_TARGET_INFO_SERVER_DNS = 3,
- NTLM_TARGET_INFO_DOMAIN_DNS = 4,
+ NTLM_TARGET_INFO_DOMAIN_DNS = 4
} ntlm_target_info_type_t;
typedef enum {
@@ -168,7 +168,7 @@ typedef enum {
NTLM_NEGOTIATE_TARGET_INFO = 0x00800000,
/* Version information should be provided */
- NTLM_NEGOTIATE_VERSION = 0x01000000,
+ NTLM_NEGOTIATE_VERSION = 0x01000000
} ntlm_negotiate_t;
extern int ntlm_client_set_nonce(ntlm_client *ntlm, uint64_t nonce);
diff --git a/deps/ntlmclient/ntlmclient.h b/deps/ntlmclient/ntlmclient.h
index bf57b17c6..958b27e62 100644
--- a/deps/ntlmclient/ntlmclient.h
+++ b/deps/ntlmclient/ntlmclient.h
@@ -32,7 +32,7 @@ typedef enum {
/**
* The input provided to the function is missing or invalid.
*/
- NTLM_CLIENT_ERROR_INVALID_INPUT = -2,
+ NTLM_CLIENT_ERROR_INVALID_INPUT = -2
} ntlm_error_code;
/*
@@ -98,7 +98,7 @@ typedef enum {
* its idea of its hostname in the challenge message. You may
* then set the authentication target based on it.
*/
- NTLM_CLIENT_DISABLE_REQUEST_TARGET = (1 << 4),
+ NTLM_CLIENT_DISABLE_REQUEST_TARGET = (1 << 4)
} ntlm_client_flags;
diff --git a/deps/pcre/CMakeLists.txt b/deps/pcre/CMakeLists.txt
index aff2d751b..431dda01a 100644
--- a/deps/pcre/CMakeLists.txt
+++ b/deps/pcre/CMakeLists.txt
@@ -1,95 +1,95 @@
-INCLUDE(CheckIncludeFile)
-INCLUDE(CheckFunctionExists)
-INCLUDE(CheckTypeSize)
-
-CHECK_INCLUDE_FILE(dirent.h HAVE_DIRENT_H)
-CHECK_INCLUDE_FILE(stdint.h HAVE_STDINT_H)
-CHECK_INCLUDE_FILE(inttypes.h HAVE_INTTYPES_H)
-CHECK_INCLUDE_FILE(sys/stat.h HAVE_SYS_STAT_H)
-CHECK_INCLUDE_FILE(sys/types.h HAVE_SYS_TYPES_H)
-CHECK_INCLUDE_FILE(unistd.h HAVE_UNISTD_H)
-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
-
-CHECK_FUNCTION_EXISTS(bcopy HAVE_BCOPY)
-CHECK_FUNCTION_EXISTS(memmove HAVE_MEMMOVE)
-CHECK_FUNCTION_EXISTS(strerror HAVE_STRERROR)
-CHECK_FUNCTION_EXISTS(strtoll HAVE_STRTOLL)
-CHECK_FUNCTION_EXISTS(strtoq HAVE_STRTOQ)
-CHECK_FUNCTION_EXISTS(_strtoi64 HAVE__STRTOI64)
-
-CHECK_TYPE_SIZE("long long" LONG_LONG)
-CHECK_TYPE_SIZE("unsigned long long" UNSIGNED_LONG_LONG)
-
-DISABLE_WARNINGS(unused-function)
-DISABLE_WARNINGS(implicit-fallthrough)
+include(CheckIncludeFile)
+include(CheckFunctionExists)
+include(CheckTypeSize)
+
+check_include_file(dirent.h HAVE_DIRENT_H)
+check_include_file(stdint.h HAVE_STDINT_H)
+check_include_file(inttypes.h HAVE_INTTYPES_H)
+check_include_file(sys/stat.h HAVE_SYS_STAT_H)
+check_include_file(sys/types.h HAVE_SYS_TYPES_H)
+check_include_file(unistd.h HAVE_UNISTD_H)
+check_include_file(windows.h HAVE_WINDOWS_H)
+
+check_function_exists(bcopy HAVE_BCOPY)
+check_function_exists(memmove HAVE_MEMMOVE)
+check_function_exists(strerror HAVE_STRERROR)
+check_function_exists(strtoll HAVE_STRTOLL)
+check_function_exists(strtoq HAVE_STRTOQ)
+check_function_exists(_strtoi64 HAVE__STRTOI64)
+
+check_type_size("long long" LONG_LONG)
+check_type_size("unsigned long long" UNSIGNED_LONG_LONG)
+
+disable_warnings(unused-function)
+disable_warnings(implicit-fallthrough)
# User-configurable options
-SET(SUPPORT_PCRE8 1)
-SET(PCRE_LINK_SIZE "2")
-SET(PCRE_PARENS_NEST_LIMIT "250")
-SET(PCRE_MATCH_LIMIT "10000000")
-SET(PCRE_MATCH_LIMIT_RECURSION "MATCH_LIMIT")
-SET(PCRE_NEWLINE "LF")
-SET(NO_RECURSE 1)
-SET(PCRE_POSIX_MALLOC_THRESHOLD "10")
-SET(BSR_ANYCRLF 0)
-
-IF (MINGW)
- OPTION(NON_STANDARD_LIB_PREFIX
- "ON=Shared libraries built in mingw will be named pcre.dll, etc., instead of libpcre.dll, etc."
- OFF)
-
- OPTION(NON_STANDARD_LIB_SUFFIX
- "ON=Shared libraries built in mingw will be named libpcre-0.dll, etc., instead of libpcre.dll, etc."
- OFF)
-ENDIF(MINGW)
+set(SUPPORT_PCRE8 1)
+set(PCRE_LINK_SIZE "2")
+set(PCRE_PARENS_NEST_LIMIT "250")
+set(PCRE_MATCH_LIMIT "10000000")
+set(PCRE_MATCH_LIMIT_RECURSION "MATCH_LIMIT")
+set(PCRE_NEWLINE "LF")
+set(NO_RECURSE 1)
+set(PCRE_POSIX_MALLOC_THRESHOLD "10")
+set(BSR_ANYCRLF 0)
+
+if(MINGW)
+ option(NON_STANDARD_LIB_PREFIX
+ "ON=Shared libraries built in mingw will be named pcre.dll, etc., instead of libpcre.dll, etc."
+ OFF)
+
+ option(NON_STANDARD_LIB_SUFFIX
+ "ON=Shared libraries built in mingw will be named libpcre-0.dll, etc., instead of libpcre.dll, etc."
+ OFF)
+endif(MINGW)
# Prepare build configuration
-SET(pcre_have_long_long 0)
-SET(pcre_have_ulong_long 0)
-
-IF(HAVE_LONG_LONG)
- SET(pcre_have_long_long 1)
-ENDIF(HAVE_LONG_LONG)
-
-IF(HAVE_UNSIGNED_LONG_LONG)
- SET(pcre_have_ulong_long 1)
-ENDIF(HAVE_UNSIGNED_LONG_LONG)
-
-SET(NEWLINE "")
-
-IF(PCRE_NEWLINE STREQUAL "LF")
- SET(NEWLINE "10")
-ENDIF(PCRE_NEWLINE STREQUAL "LF")
-IF(PCRE_NEWLINE STREQUAL "CR")
- SET(NEWLINE "13")
-ENDIF(PCRE_NEWLINE STREQUAL "CR")
-IF(PCRE_NEWLINE STREQUAL "CRLF")
- SET(NEWLINE "3338")
-ENDIF(PCRE_NEWLINE STREQUAL "CRLF")
-IF(PCRE_NEWLINE STREQUAL "ANY")
- SET(NEWLINE "-1")
-ENDIF(PCRE_NEWLINE STREQUAL "ANY")
-IF(PCRE_NEWLINE STREQUAL "ANYCRLF")
- SET(NEWLINE "-2")
-ENDIF(PCRE_NEWLINE STREQUAL "ANYCRLF")
-
-IF(NEWLINE STREQUAL "")
- MESSAGE(FATAL_ERROR "The PCRE_NEWLINE variable must be set to one of the following values: \"LF\", \"CR\", \"CRLF\", \"ANY\", \"ANYCRLF\".")
-ENDIF(NEWLINE STREQUAL "")
+set(pcre_have_long_long 0)
+set(pcre_have_ulong_long 0)
+
+if(HAVE_LONG_LONG)
+ set(pcre_have_long_long 1)
+endif(HAVE_LONG_LONG)
+
+if(HAVE_UNSIGNED_LONG_LONG)
+ set(pcre_have_ulong_long 1)
+endif(HAVE_UNSIGNED_LONG_LONG)
+
+set(NEWLINE "")
+
+if(PCRE_NEWLINE STREQUAL "LF")
+ set(NEWLINE "10")
+endif(PCRE_NEWLINE STREQUAL "LF")
+if(PCRE_NEWLINE STREQUAL "CR")
+ set(NEWLINE "13")
+endif(PCRE_NEWLINE STREQUAL "CR")
+if(PCRE_NEWLINE STREQUAL "CRLF")
+ set(NEWLINE "3338")
+endif(PCRE_NEWLINE STREQUAL "CRLF")
+if(PCRE_NEWLINE STREQUAL "ANY")
+ set(NEWLINE "-1")
+endif(PCRE_NEWLINE STREQUAL "ANY")
+if(PCRE_NEWLINE STREQUAL "ANYCRLF")
+ set(NEWLINE "-2")
+endif(PCRE_NEWLINE STREQUAL "ANYCRLF")
+
+if(NEWLINE STREQUAL "")
+ message(FATAL_ERROR "The PCRE_NEWLINE variable must be set to one of the following values: \"LF\", \"CR\", \"CRLF\", \"ANY\", \"ANYCRLF\".")
+endif(NEWLINE STREQUAL "")
# Output files
-CONFIGURE_FILE(config.h.in
+configure_file(config.h.in
${PROJECT_BINARY_DIR}/src/pcre/config.h
@ONLY)
# Source code
-SET(PCRE_HEADERS ${PROJECT_BINARY_DIR}/src/pcre/config.h)
+set(PCRE_HEADERS ${PROJECT_BINARY_DIR}/src/pcre/config.h)
-SET(PCRE_SOURCES
+set(PCRE_SOURCES
pcre_byte_order.c
pcre_chartables.c
pcre_compile.c
@@ -113,28 +113,28 @@ SET(PCRE_SOURCES
pcre_xclass.c
)
-SET(PCREPOSIX_HEADERS pcreposix.h)
+set(PCREPOSIX_HEADERS pcreposix.h)
-SET(PCREPOSIX_SOURCES pcreposix.c)
+set(PCREPOSIX_SOURCES pcreposix.c)
# Fix static compilation with MSVC: https://bugs.exim.org/show_bug.cgi?id=1681
# This code was taken from the CMake wiki, not from WebM.
# Build setup
-ADD_DEFINITIONS(-DHAVE_CONFIG_H)
+add_definitions(-DHAVE_CONFIG_H)
-IF(MSVC)
- ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
-ENDIF(MSVC)
+if(MSVC)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
+endif(MSVC)
-SET(CMAKE_INCLUDE_CURRENT_DIR 1)
+set(CMAKE_INCLUDE_CURRENT_DIR 1)
-SET(targets)
+set(targets)
# Libraries
# pcre
-INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/src/pcre)
-ADD_LIBRARY(pcre OBJECT ${PCRE_HEADERS} ${PCRE_SOURCES} ${PCREPOSIX_SOURCES})
+include_directories(${PROJECT_BINARY_DIR}/src/pcre)
+add_library(pcre OBJECT ${PCRE_HEADERS} ${PCRE_SOURCES} ${PCREPOSIX_SOURCES})
# end CMakeLists.txt
diff --git a/deps/winhttp/CMakeLists.txt b/deps/winhttp/CMakeLists.txt
index 148ac3ebc..1a87989b9 100644
--- a/deps/winhttp/CMakeLists.txt
+++ b/deps/winhttp/CMakeLists.txt
@@ -1,26 +1,24 @@
-FIND_PROGRAM(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH)
-IF (NOT DLLTOOL)
- MESSAGE(FATAL_ERROR "Could not find dlltool command")
-ENDIF ()
+find_program(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH)
+if(NOT DLLTOOL)
+ message(FATAL_ERROR "Could not find dlltool command")
+endif()
-SET(LIBWINHTTP_PATH "${libgit2_BINARY_DIR}/deps/winhttp")
-SET(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
-FILE(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
+set(LIBWINHTTP_PATH "${PROJECT_BINARY_DIR}/deps/winhttp")
+set(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
+file(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
-IF (CMAKE_SIZEOF_VOID_P EQUAL 8)
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(WINHTTP_DEF "winhttp64.def")
-ELSE()
+else()
set(WINHTTP_DEF "winhttp.def")
-ENDIF()
+endif()
-ADD_CUSTOM_COMMAND(
+add_custom_command(
OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a
COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a
DEPENDS ${WINHTTP_DEF}
- WORKING_DIRECTORY ${LIBWINHTTP_PATH}
-)
+ WORKING_DIRECTORY ${LIBWINHTTP_PATH})
-SET_SOURCE_FILES_PROPERTIES(
+set_source_files_properties(
${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c
- PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
-)
+ PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a)
View Lorry Controller Status