Skip to content

Commit

Permalink
Added custom vcpkg triplet with flags that should cut down on excessi…
Browse files Browse the repository at this point in the history
…ve library rebuilds, for example when Visual Studio gets a minor update.
  • Loading branch information
mfellows committed Feb 6, 2024
1 parent 913d33e commit e0f3021
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 4 deletions.
3 changes: 3 additions & 0 deletions Source/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"version": "1.0.6",
"builtin-baseline": "57fee154cc4068542740b4b5775343d9fd83413e",
"vcpkg-configuration": {
"overlay-triplets": [
"../vcpkg/triplets"
],
"registries": [
{
"kind": "filesystem",
Expand Down
4 changes: 4 additions & 0 deletions vcpkg/triplets/moja-x64-windows.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)
set(VCPKG_DISABLE_COMPILER_TRACKING ON)
4 changes: 2 additions & 2 deletions vcpkg/vcpkg_setup_vs2019_win_x64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ REM If OpenSSL fails to build, just keep retrying until it does.
cmake -S .. ^
-G "Visual Studio 16 2019" ^
-DCMAKE_INSTALL_PREFIX=bin ^
-DVCPKG_TARGET_TRIPLET=x64-windows ^
-DVCPKG_INSTALL_OPTIONS=--x-abi-tools-use-exact-versions ^
-DVCPKG_TARGET_TRIPLET=moja-x64-windows ^
-DVCPKG_INSTALL_OPTIONS="--x-abi-tools-use-exact-versions" ^
-DCMAKE_TOOLCHAIN_FILE=..\..\vcpkg\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-DENABLE_TESTS:BOOL=OFF ^
-DENABLE_MOJA.MODULES.ZIPPER:BOOL=ON ^
Expand Down
5 changes: 3 additions & 2 deletions vcpkg/vcpkg_setup_vs2022_win_x64.bat
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,9 @@ REM If OpenSSL fails to build, just keep retrying until it does.
cmake -S .. ^
-G "Visual Studio 17 2022" ^
-DCMAKE_INSTALL_PREFIX=bin ^
-DVCPKG_TARGET_TRIPLET=x64-windows ^
-DCMAKE_TOOLCHAIN_FILE=..\..\vcpkg\vcpkg\scripts\buildsystems\vcpkg.cmake ^
-DVCPKG_TARGET_TRIPLET=moja-x64-windows ^
-DVCPKG_INSTALL_OPTIONS="--x-abi-tools-use-exact-versions" ^
-DCMAKE_TOOLCHAIN_FILE=../../vcpkg/vcpkg/scripts/buildsystems/vcpkg.cmake ^
-DENABLE_TESTS:BOOL=OFF ^
-DENABLE_MOJA.MODULES.ZIPPER:BOOL=ON ^
-DENABLE_MOJA.MODULES.GDAL:BOOL=ON ^
Expand Down

0 comments on commit e0f3021

Please sign in to comment.