Skip to content

Commit 103ba3a

Browse files
authored
Merge pull request #3 from GordonSmith/BUMP_VCPKG
chore: bump vcpkg and fix win32 CI build
2 parents 45f4dd0 + 84c2554 commit 103ba3a

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.5)
22

33
project(cmcpp LANGUAGES CXX)
44

5-
option(BUILD_SAMPLES "Build samples" ON)
5+
# Determine default for BUILD_SAMPLES: OFF on Windows, ON elsewhere
6+
set(_BUILD_SAMPLES_DEFAULT ON)
7+
if (WIN32)
8+
set(_BUILD_SAMPLES_DEFAULT OFF)
9+
endif()
10+
option(BUILD_SAMPLES "Build samples" ${_BUILD_SAMPLES_DEFAULT})
611
option(BUILD_TESTING "Build tests" ON)
712

813
add_library(cmcpp INTERFACE)

vcpkg

Submodule vcpkg updated 8361 files

vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"default-registry": {
33
"kind": "git",
4-
"baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af",
4+
"baseline": "120deac3062162151622ca4860575a33844ba10b",
55
"repository": "https://github.com/microsoft/vcpkg"
66
},
77
"registries": [

0 commit comments

Comments
 (0)