diff --git a/CMakeLists.txt b/CMakeLists.txt index dbe28c9..453fe5d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,12 @@ cmake_minimum_required(VERSION 3.5) project(cmcpp LANGUAGES CXX) -option(BUILD_SAMPLES "Build samples" ON) +# Determine default for BUILD_SAMPLES: OFF on Windows, ON elsewhere +set(_BUILD_SAMPLES_DEFAULT ON) +if (WIN32) + set(_BUILD_SAMPLES_DEFAULT OFF) +endif() +option(BUILD_SAMPLES "Build samples" ${_BUILD_SAMPLES_DEFAULT}) option(BUILD_TESTING "Build tests" ON) add_library(cmcpp INTERFACE) diff --git a/vcpkg b/vcpkg index 3850888..120deac 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit 3850888eb8480abc8f73f84bf618de3b68900572 +Subproject commit 120deac3062162151622ca4860575a33844ba10b diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json index 0f861db..f311a6e 100644 --- a/vcpkg-configuration.json +++ b/vcpkg-configuration.json @@ -1,7 +1,7 @@ { "default-registry": { "kind": "git", - "baseline": "fba75d09065fcc76a25dcf386b1d00d33f5175af", + "baseline": "120deac3062162151622ca4860575a33844ba10b", "repository": "https://github.com/microsoft/vcpkg" }, "registries": [