mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-04 13:59:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
0434ef70ae
vcpkg/ports/gmp/vs.build.patch

166 lines
8.1 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/libgmp.vcxproj b/SMP/libgmp.vcxproj
index b4e06ae42..442d82c51 100644
--- a/SMP/libgmp.vcxproj
+++ b/SMP/libgmp.vcxproj
@@ -1559,114 +1559,114 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd_winrt</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>libgmpd</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmpd_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>libgmpd</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmpd_winrt</TargetName>
+ <TargetName>gmpd</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmpd</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmpd_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>gmpd</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp_winrt</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>libgmp</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>libgmp_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>libgmp</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmp_winrt</TargetName>
+ <TargetName>gmp</TargetName>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
<TargetName>gmp</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
<IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
- <TargetName>gmp_winrt</TargetName>
- <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
+ <TargetName>gmp</TargetName>
+ <OutDir>$(ProjectDir)..\msvc\</OutDir>
<CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
<MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
</PropertyGroup>
diff --git a/gmp.pc.in b/gmp.pc.in
index bf1c799ad..d0c81be91 100644
--- a/gmp.pc.in
+++ b/gmp.pc.in
@@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
URL: https://gmplib.org
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}
-Libs: -L${libdir} -lgmp
+Libs: -L${libdir} @LIBS@
diff --git a/gmpxx.pc.in b/gmpxx.pc.in
index 181cc70c6..2b697ceab 100644
--- a/gmpxx.pc.in
+++ b/gmpxx.pc.in
@@ -9,4 +9,4 @@ URL: https://gmplib.org
Version: @PACKAGE_VERSION@
Requires: gmp
Cflags: -I${includedir}
-Libs: -L${libdir} -lgmpxx
+Libs: -L${libdir} @LIBS@
Reference in New Issue Copy Permalink