mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-21 10:37:55 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9ee052937c
vcpkg/ports/nettle/runtime.nettle.patch

85 lines
4.9 KiB
Diff
Raw Normal View History

[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
2020-05-09 04:55:11 +08:00
diff --git a/SMP/libnettle.vcxproj b/SMP/libnettle.vcxproj
index 54f686af6..05b903ab9 100644
--- a/SMP/libnettle.vcxproj
+++ b/SMP/libnettle.vcxproj
@@ -1206,6 +1206,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<MinimalRebuild>false</MinimalRebuild>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -1329,6 +1330,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<CompileAsWinRT>false</CompileAsWinRT>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -1710,6 +1712,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<MinimalRebuild>false</MinimalRebuild>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -1838,6 +1841,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<CompileAsWinRT>false</CompileAsWinRT>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
</ClCompile>
<Link>
<OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2229,6 +2233,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -2358,6 +2363,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<CompileAsWinRT>false</CompileAsWinRT>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
@@ -3028,6 +3034,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -3161,6 +3168,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -3296,6 +3304,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<CompileAsWinRT>false</CompileAsWinRT>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -3433,6 +3442,7 @@ del /f /q $(OutDir)\licenses\nettle.txt
<CompileAsWinRT>false</CompileAsWinRT>
<TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
<DisableSpecificWarnings>4244;4146;4267;4098;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+ <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
Reference in New Issue Copy Permalink