Skip to content

Commit

Permalink
Default Building only Library (microsoft#2406)
Browse files Browse the repository at this point in the history
* Default Building only Library

* Enable tools for docker
  • Loading branch information
nibanks authored Feb 18, 2022
1 parent d118367 commit 802dc93
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 15 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions scripts/build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 0 additions & 3 deletions scripts/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
5 changes: 2 additions & 3 deletions scripts/qns.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 802dc93

Please sign in to comment.