* Default Building only Library

* Enable tools for docker
This commit is contained in:
Nick Banks 2022-02-18 16:46:02 -05:00 коммит произвёл GitHub
Родитель d11836717d
Коммит 802dc93f5d
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
4 изменённых файлов: 11 добавлений и 15 удалений

Просмотреть файл

@ -78,9 +78,9 @@ else()
set(QUIC_TLS "openssl" CACHE STRING "TLS Library to use")
endif()
option(QUIC_BUILD_TOOLS "Builds the tools code" ON)
option(QUIC_BUILD_TEST "Builds the test code" ON)
option(QUIC_BUILD_PERF "Builds the perf code" ON)
option(QUIC_BUILD_TOOLS "Builds the tools code" OFF)
option(QUIC_BUILD_TEST "Builds the test code" OFF)
option(QUIC_BUILD_PERF "Builds the perf code" OFF)
option(QUIC_BUILD_SHARED "Builds msquic as a dynamic library" ON)
option(QUIC_ENABLE_LOGGING "Enables logging" OFF)
option(QUIC_ENABLE_SANITIZERS "Enables sanitizers" OFF)

Просмотреть файл

@ -359,14 +359,14 @@ function CMake-Generate {
if ($CodeCheck) {
$Arguments += " -DQUIC_CODE_CHECK=on"
}
if ($DisableTools) {
$Arguments += " -DQUIC_BUILD_TOOLS=off"
if (!$DisableTools) {
$Arguments += " -DQUIC_BUILD_TOOLS=on"
}
if ($DisableTest) {
$Arguments += " -DQUIC_BUILD_TEST=off"
if (!$DisableTest) {
$Arguments += " -DQUIC_BUILD_TEST=on"
}
if ($DisablePerf) {
$Arguments += " -DQUIC_BUILD_PERF=off"
if (!$DisablePerf) {
$Arguments += " -DQUIC_BUILD_PERF=on"
}
if (!$IsWindows) {
$ConfigToBuild = $Config;

Просмотреть файл

@ -13,9 +13,6 @@ fn main() {
// Builds the native MsQuic and installs it into $OUT_DIR.
let dst = Config::new(".")
.define("QUIC_BUILD_TEST", "off")
.define("QUIC_BUILD_TOOLS", "off")
.define("QUIC_BUILD_PERF", "off")
.define("QUIC_SOURCE_LINK", "off")
.define("QUIC_ENABLE_LOGGING", logging_enabled)
.define("QUIC_TLS", "openssl")

Просмотреть файл

@ -13,9 +13,8 @@ WORKDIR /src/Debug
RUN chmod +x /src/scripts/install-powershell-docker.sh
RUN /src/scripts/install-powershell-docker.sh
ENV PATH="/root/.dotnet/tools:${PATH}"
RUN cmake -DQUIC_BUILD_TEST=OFF -DQUIC_BUILD_PERF=OFF \
-DQUIC_ENABLE_LOGGING=on \
-DQUIC_DISABLE_POSIX_GSO=on ..
RUN cmake -DQUIC_BUILD_TOOLS=on -DQUIC_ENABLE_LOGGING=on \
-DQUIC_DISABLE_POSIX_GSO=on ..
RUN cmake --build .
FROM martenseemann/quic-network-simulator-endpoint@sha256:ff6ab6273c22d0609e2c0a123a15310da8bcd27052e8aaf10a6cc799a0218a4c