diff --git a/.gitlab/Windows-CI.yml b/.gitlab/Windows-CI.yml index f57f4d3b8f..86c5e6290a 100644 --- a/.gitlab/Windows-CI.yml +++ b/.gitlab/Windows-CI.yml @@ -9,7 +9,6 @@ win64_build: image: registry.gitlab.com/kicad/kicad-ci/windows-build-image/ltsc2022-msvc:latest variables: VCPKG_BINARY_SOURCES: 'nuget,gitlab,readwrite' - VCPKG_DISABLE_COMPILER_TRACKING: '1' # Switch the compressor to fastzip and reduce the compression level FF_USE_FASTZIP: "true" CACHE_COMPRESSION_LEVEL: "fast" @@ -37,6 +36,8 @@ win64_build: -DKICAD_BUILD_PNS_DEBUG_TOOL=ON ` -DKICAD_USE_3DCONNEXION=ON ` -DVCPKG_BUILD_TYPE=debug ` + -DVCPKG_INSTALL_OPTIONS="--x-abi-tools-use-exact-versions" ` + -DVCPKG_OVERLAY_TRIPLETS="$Env:CI_PROJECT_DIR/tools/custom_vcpkg_triplets" ` ../../ - cmake --build . 2>&1 | tee compilation_log.txt - cd ../../ diff --git a/CMakeSettings.json.sample b/CMakeSettings.json.sample index ac4b256f5b..d610a6ded5 100644 --- a/CMakeSettings.json.sample +++ b/CMakeSettings.json.sample @@ -6,7 +6,12 @@ }, { "environment": "vcpkg", - "VcPkgDir": "D:/vcpkg/" + "VcPkgDir": "D:/vcpkg/", + "VCPKG_BINARY_SOURCES": "nuget,kicad-gitlab,read" + }, + { + "environment": "swig", + "SwigExePath": "D:/swigwin-4.1.1/swig.exe" } ], "configurations": [ @@ -14,7 +19,7 @@ "name": "x64-Debug", "generator": "Ninja", "configurationType": "Debug", - "inheritEnvironments": [ "msvc_x64_x64", "vcpkg" ], + "inheritEnvironments": [ "msvc_x64_x64", "vcpkg", "swig"], "buildRoot": "${env.BuildDir}\\${name}", "installRoot": "${env.InstallDir}\\${name}", "cmakeCommandArgs": "", @@ -30,6 +35,21 @@ "name": "KICAD_WIN32_DPI_AWARE", "value": "ON", "type": "BOOL" + }, + { + "name": "SWIG_EXECUTABLE", + "value": "${env.SwigExePath}", + "type": "STRING" + }, + { + "name": "VCPKG_OVERLAY_TRIPLETS", + "value": "${workspaceRoot}/tools/custom_vcpkg_triplets", + "type": "STRING" + }, + { + "name": "VCPKG_INSTALL_OPTIONS", + "value": "--x-abi-tools-use-exact-versions", + "type": "STRING" } ], "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" @@ -38,7 +58,7 @@ "name": "x64-Release", "generator": "Ninja", "configurationType": "RelWithDebInfo", - "inheritEnvironments": [ "msvc_x64_x64", "vcpkg" ], + "inheritEnvironments": [ "msvc_x64_x64", "vcpkg", "swig"], "buildRoot": "${env.BuildDir}\\${name}", "installRoot": "${env.InstallDir}\\${name}", "cmakeCommandArgs": "", @@ -54,6 +74,21 @@ "name": "KICAD_WIN32_DPI_AWARE", "value": "ON", "type": "BOOL" + }, + { + "name": "SWIG_EXECUTABLE", + "value": "${env.SwigExePath}", + "type": "STRING" + }, + { + "name": "VCPKG_OVERLAY_TRIPLETS", + "value": "${workspaceRoot}/tools/custom_vcpkg_triplets", + "type": "STRING" + }, + { + "name": "VCPKG_INSTALL_OPTIONS", + "value": "--x-abi-tools-use-exact-versions", + "type": "STRING" } ], "cmakeToolchain": "${env.VcPkgDir}/scripts/buildsystems/vcpkg.cmake" diff --git a/tools/custom_vcpkg_triplets/x64-windows.cmake b/tools/custom_vcpkg_triplets/x64-windows.cmake new file mode 100644 index 0000000000..8d2e47ae60 --- /dev/null +++ b/tools/custom_vcpkg_triplets/x64-windows.cmake @@ -0,0 +1,3 @@ +include("${VCPKG_ROOT_DIR}/triplets/x64-windows.cmake") + +set(VCPKG_DISABLE_COMPILER_TRACKING ON) \ No newline at end of file