aboutsummaryrefslogtreecommitdiff
path: root/scripts/cmake/vcpkg_install_msbuild.cmake
diff options
context:
space:
mode:
authorAlexander Neumann <30894796+Neumann-A@users.noreply.github.com>2020-05-08 22:55:11 +0200
committerGitHub <noreply@github.com>2020-05-08 13:55:11 -0700
commit18ab20050cc8580a3f47aeaa5d35f24f3a87bd76 (patch)
treecd0e6d358b8715c3f3f78f4eca30a1bba53225c4 /scripts/cmake/vcpkg_install_msbuild.cmake
parentce65b330babfedd3bd7bd0dda6123bf7a7128b19 (diff)
downloadvcpkg-18ab20050cc8580a3f47aeaa5d35f24f3a87bd76.tar.gz
vcpkg-18ab20050cc8580a3f47aeaa5d35f24f3a87bd76.zip
[gmp,nettle,hogweed] Add new ports (#10613)
* add new function vcpkg_fixup_pkgconfig * make message with changed files a debug_message * add two more cases to the debug *.pc files * comment out prefix. use --define-variable=prefix=INSTALL_PATH * changed the comment header. * add missing word * finish vcpkg_fixup_pkgconfig.cmake * Update vcpkg_fixup_pkgconfig.cmake Note: since CMake is run in script mode the description of VCPKG_FIXUP_PKGCONFIG_CALLED cannot be viewed * transfer changes from x windows pr * fix typo in regex * add port for vs yasm integration within VCPKG * add gmp * add nettle * add missing windows flag in control * CI workaround CI seems to not pass env YASMPATH correctly to cl. Since YASM is on PATH -> remove $(VCInstallDir) as the default for YasmPath * overwrite correct import. * If CI does not give logs just display some extra info * target replacement was mising * apply same replacements for nettle * remove unnecessary status message * remove unnecessary platform code * update supports field for vs-yasm * apply replacement also to libhogweed * fix static builds * remove not working code * remove debug/release options * add additional replacement for the case the SOURCE dir has already been patched within VCPKG * add triplet selection to vcpkg_install_msbuild * fix missing ; in patches * remove gmp dependency in static builds since they are not required * cleanup portfiles * add missing vcpkg_fixup_pkgconfig() call
Diffstat (limited to 'scripts/cmake/vcpkg_install_msbuild.cmake')
-rw-r--r--scripts/cmake/vcpkg_install_msbuild.cmake1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/cmake/vcpkg_install_msbuild.cmake b/scripts/cmake/vcpkg_install_msbuild.cmake
index db2874a9f..01bf49f02 100644
--- a/scripts/cmake/vcpkg_install_msbuild.cmake
+++ b/scripts/cmake/vcpkg_install_msbuild.cmake
@@ -136,6 +136,7 @@ function(vcpkg_install_msbuild)
/p:VCPkgLocalAppDataDisabled=true
/p:UseIntelMKL=No
/p:WindowsTargetPlatformVersion=${_csc_TARGET_PLATFORM_VERSION}
+ /p:VcpkgTriplet=${TARGET_TRIPLET}
/m
)