Skip to content

Fix Windows to use /MT when building static libraries. #1394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Oct 2, 2020
Merged

Fix Windows to use /MT when building static libraries. #1394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0875ebb
Fix Windows to use /MT when building static libraries.
BillyONeal Oct 1, 2020
065839c
Less -md.
BillyONeal Oct 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,13 @@ if(DEFINED ENV{VCPKG_DEFAULT_TRIPLET} AND NOT DEFINED VCPKG_TARGET_TRIPLET)
set(VCPKG_TARGET_TRIPLET "$ENV{VCPKG_DEFAULT_TRIPLET}" CACHE STRING "")
endif()

# Use the static runtime libraries when building statically for consistency with vcpkg's
# arch-windows-static triplets:
cmake_policy(SET CMP0091 NEW) # https://cmake.org/cmake/help/v3.15/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html
if (NOT DEFINED CMAKE_MSVC_RUNTIME_LIBRARY)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
endif()

project(az LANGUAGES C)
enable_testing ()

Expand Down Expand Up @@ -104,7 +111,7 @@ if (UNIT_TESTING)
if (CMAKE_C_COMPILER_ID MATCHES "GNU")
set(NO_CLOBBERED_WARNING "-Wno-clobbered")
endif()

# Core
add_subdirectory(sdk/tests/core)

Expand Down
6 changes: 3 additions & 3 deletions eng/pipelines/templates/jobs/archetype-sdk-client.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ jobs:
WindowsX86_Release_MapFiles_UnitTests:
OSVmImage: 'windows-2019'
vcpkg.deps: 'cmocka'
VCPKG_DEFAULT_TRIPLET: 'x86-windows-static-md'
VCPKG_DEFAULT_TRIPLET: 'x86-windows-static'
build.args: '-DPRECONDITIONS=OFF -DUNIT_TESTING=ON -DLOGGING=OFF'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: Win32
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
Windows_Preconditions_UnitTests_Samples:
OSVmImage: 'windows-2019'
vcpkg.deps: 'curl[winssl] paho-mqtt cmocka'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static-md'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DTRANSPORT_CURL=ON -DTRANSPORT_PAHO=ON -DAZ_PLATFORM_IMPL=WIN32 -DUNIT_TESTING=ON -DLOGGING=OFF'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: x64
Expand Down Expand Up @@ -215,7 +215,7 @@ jobs:
Windows_Release_MapFiles:
OSVmImage: 'windows-2019'
vcpkg.deps: ''
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static-md'
VCPKG_DEFAULT_TRIPLET: 'x64-windows-static'
build.args: '-DPRECONDITIONS=OFF -DLOGGING=OFF'
CMAKE_GENERATOR: 'Visual Studio 16 2019'
CMAKE_GENERATOR_PLATFORM: x64
Expand Down