From 1458e28f3683c916ecdb348b09f37af453b16f53 Mon Sep 17 00:00:00 2001 From: Viktor Szakats Date: Thu, 4 May 2023 22:17:03 +0000 Subject: [PATCH] cmake: move `CMAKE_VS_GLOBALS` setting to CI configs To not force this setting for local builds where they might serve a good purpose. It makes our CI runs slightly faster and we don't need to track file changes in unattended, single, CI runs. Cherry-picked from #1031 --- .github/workflows/ci.yml | 1 + CMakeLists.txt | 4 ---- appveyor.yml | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f856af60..48144ada 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -222,6 +222,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake \ -DCMAKE_GENERATOR_PLATFORM=${archgen} \ -DVCPKG_TARGET_TRIPLET=${{ matrix.arch }}-${{ matrix.plat }} \ + -DCMAKE_VS_GLOBALS=TrackFileAccess=false \ -DENABLE_WERROR=ON \ -DENABLE_DEBUG_LOGGING=${{ matrix.log }} \ -DBUILD_SHARED_LIBS=${{ matrix.shared }} \ diff --git a/CMakeLists.txt b/CMakeLists.txt index 480f6df8..627f4d56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -91,10 +91,6 @@ install( docs/AUTHORS docs/BINDINGS.md docs/HACKING.md DESTINATION ${CMAKE_INSTALL_DOCDIR}) -if(MSVC) - set(CMAKE_VS_GLOBALS "TrackFileAccess=false") # faster builds -endif() - include(max_warnings) # Add socket libraries diff --git a/appveyor.yml b/appveyor.yml index 816be0ca..362a5a9d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -167,6 +167,7 @@ build_script: if($env:UWP -eq "ON") { $env:CMAKE_ARG += " -DCMAKE_SYSTEM_NAME=WindowsStore -DCMAKE_SYSTEM_VERSION=10.0" } + $env:CMAKE_ARG += " -DCMAKE_VS_GLOBALS=TrackFileAccess=false" # FIXME: First sshd test sometimes timeouts, subsequent ones almost always fail: # 'libssh2_session_handshake failed (-43): Failed getting banner' - echo cmake "-G%GENERATOR%" %CMAKE_ARG% -DENABLE_WERROR=ON -DBUILD_SHARED_LIBS=%BUILD_SHARED_LIBS% -DCRYPTO_BACKEND=%CRYPTO_BACKEND% -DRUN_SSHD_TESTS=OFF