[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

5 files changed, 383 insertions, 0 deletions

diff --git a/ports/gmp/CONTROL b/ports/gmp/CONTROL
new file mode 100644
index 000000000..54fe0fe2c
--- /dev/null
+++ b/ports/gmp/CONTROL
@@ -0,0 +1,5 @@
+Source: gmp

+Version: 6.2.0

+Homepage: https://gmplib.org/

+Description: The GNU Multiple Precision Arithmetic Library

+Build-Depends: vs-yasm (windows)
\ No newline at end of file
diff --git a/ports/gmp/portfile.cmake b/ports/gmp/portfile.cmake
new file mode 100644
index 000000000..be12772d0
--- /dev/null
+++ b/ports/gmp/portfile.cmake
@@ -0,0 +1,107 @@
+if(VCPKG_TARGET_IS_WINDOWS)

+    vcpkg_from_github(

+        OUT_SOURCE_PATH SOURCE_PATH

+        REPO ShiftMediaProject/gmp

+        REF e140dfc8668e96d7e56cbd46467945adcc6b3cc4 #v6.2.0

+        SHA512 3b646c142447946bb4556db01214ff130da917bc149946b8cf086f3b01e1cc3d664b941a30a42608799c14461b2f29e4b894b72915d723bd736513c8914729b7

+        HEAD_REF master

+        PATCHES vs.build.patch

+                runtime.patch

+                prefix.patch

+    )

+    vcpkg_find_acquire_program(YASM)

+    get_filename_component(YASM_DIR "${YASM}" DIRECTORY)

+    vcpkg_add_to_path(${YASM_DIR})

+    set(ENV{YASMPATH} ${YASM_DIR}/)

+

+    if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")

+        set(CONFIGURATION_RELEASE ReleaseDLL)

+        set(CONFIGURATION_DEBUG DebugDLL)

+    else()

+        set(CONFIGURATION_RELEASE Release)

+        set(CONFIGURATION_DEBUG Debug)

+    endif()

+

+    if(VCPKG_TARGET_IS_UWP)

+        string(APPEND CONFIGURATION_RELEASE WinRT)

+        string(APPEND CONFIGURATION_DEBUG WinRT)

+    endif()

+

+    #Setup YASM integration

+    set(_file "${SOURCE_PATH}/SMP/libgmp.vcxproj")

+    file(READ "${_file}" _contents)

+    string(REPLACE  [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.props" />]]

+                     "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.props\" />"

+                    _contents "${_contents}")

+    string(REPLACE  [[<Import Project="$(VCTargetsPath)\BuildCustomizations\yasm.targets" />]]

+                     "<Import Project=\"${CURRENT_INSTALLED_DIR}/share/vs-yasm/yasm.targets\" />"

+                    _contents "${_contents}")

+    string(REGEX REPLACE "${VCPKG_ROOT_DIR}/installed/[^/]+/share" "${CURRENT_INSTALLED_DIR}/share" _contents "${_contents}") # Above already replaced by another triplet

+    if(VCPKG_LIBRARY_LINKAGE STREQUAL static)

+        STRING(REPLACE ">MultiThreadedDebugDLL<" ">MultiThreadedDebug<" _contents "${_contents}")

+        STRING(REPLACE ">MultiThreadedDLL<" ">MultiThreaded<" _contents "${_contents}")

+    else()

+        STRING(REPLACE ">MultiThreadedDebug<" ">MultiThreadedDebugDLL<" _contents "${_contents}")

+        STRING(REPLACE ">MultiThreaded<" ">MultiThreadedDLL<" _contents "${_contents}")

+    endif()

+    file(WRITE "${_file}" "${_contents}")

+    

+    vcpkg_install_msbuild(

+        USE_VCPKG_INTEGRATION

+        SOURCE_PATH ${SOURCE_PATH}

+        PROJECT_SUBPATH SMP/libgmp.sln

+        PLATFORM ${TRIPLET_SYSTEM_ARCH}

+        LICENSE_SUBPATH COPYING.LESSERv3

+        TARGET Rebuild

+        RELEASE_CONFIGURATION ${CONFIGURATION_RELEASE}

+        DEBUG_CONFIGURATION ${CONFIGURATION_DEBUG}

+        SKIP_CLEAN

+    )

+    get_filename_component(SOURCE_PATH_SUFFIX "${SOURCE_PATH}" NAME)

+    file(RENAME "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/${SOURCE_PATH_SUFFIX}/msvc/include" "${CURRENT_PACKAGES_DIR}/include")

+    set(PACKAGE_VERSION 6.2.0)

+    set(PACKAGE_NAME gmp)

+    set(prefix "${CURRENT_INSTALLED_DIR}")

+    set(exec_prefix "\${prefix}")

+    set(libdir "\${prefix}/lib")

+    set(includedir "\${prefix}/include")

+    set(LIBS -lgmp)

+    configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmp.pc" @ONLY)

+    configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gmpxx.pc" @ONLY)

+    set(prefix "${CURRENT_INSTALLED_DIR}/debug")

+    set(exec_prefix "\${prefix}")

+    set(libdir "\${prefix}/lib")

+    set(includedir "\${prefix}/../include")

+    set(LIBS -lgmpd)

+    configure_file("${SOURCE_PATH}/gmp.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmp.pc" @ONLY)

+    configure_file("${SOURCE_PATH}/gmpxx.pc.in" "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gmpxx.pc" @ONLY)

+    vcpkg_fixup_pkgconfig()

+else()

+    vcpkg_download_distfile(

+        ARCHIVE

+        URLS https://gmplib.org/download/gmp/gmp-6.2.0.tar.xz 

+        FILENAME gmp-6.2.0.tar.xz

+        SHA512 a066f0456f0314a1359f553c49fc2587e484ff8ac390ff88537266a146ea373f97a1c0ba24608bf6756f4eab11c9056f103c8deb99e5b57741b4f7f0ec44b90c)

+

+    vcpkg_extract_source_archive_ex(

+        OUT_SOURCE_PATH SOURCE_PATH

+        ARCHIVE ${ARCHIVE}

+        REF gmp-6.2.0

+    )

+

+    vcpkg_configure_make(

+        SOURCE_PATH ${SOURCE_PATH}

+        AUTOCONFIG

+        OPTIONS ${OPTIONS}

+    )

+

+    vcpkg_install_make()

+    vcpkg_fixup_pkgconfig()

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share/")

+    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")

+

+    # # Handle copyright

+    file(INSTALL "${SOURCE_PATH}/COPYINGv3" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

+endif()

+

+

diff --git a/ports/gmp/prefix.patch b/ports/gmp/prefix.patch
new file mode 100644
index 000000000..611c73763
--- /dev/null
+++ b/ports/gmp/prefix.patch
@@ -0,0 +1,38 @@
+diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
+index 2c5b8cdc6..157215394 100644
+--- a/SMP/libgmp.vcxproj	
++++ b/SMP/libgmp.vcxproj
+@@ -1574,14 +1574,14 @@
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+-    <TargetName>libgmpd</TargetName>
++    <TargetName>gmpd</TargetName>
+     <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</TargetName>
++    <TargetName>gmpd</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+@@ -1630,14 +1630,14 @@
+   </PropertyGroup>
+   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+     <IntDir>$(SolutionDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
+-    <TargetName>libgmp</TargetName>
++    <TargetName>gmp</TargetName>
+     <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</TargetName>
++    <TargetName>gmp</TargetName>
+     <OutDir>$(ProjectDir)..\msvc\</OutDir>
+     <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
+     <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
diff --git a/ports/gmp/runtime.patch b/ports/gmp/runtime.patch
new file mode 100644
index 000000000..b2f15d260
--- /dev/null
+++ b/ports/gmp/runtime.patch
@@ -0,0 +1,68 @@
+diff --git a/SMP/libgmp.vcxproj b/SMP/libgmp.vcxproj
+index 3c774be11..e8919240b 100644
+--- a/SMP/libgmp.vcxproj	
++++ b/SMP/libgmp.vcxproj
+@@ -1846,6 +1846,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <MinimalRebuild>false</MinimalRebuild>
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
++      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+     </ClCompile>
+     <Lib>
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -1929,6 +1930,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <SDLCheck>false</SDLCheck>
++      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+     </ClCompile>
+     <Lib>
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -2190,6 +2192,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <MinimalRebuild>false</MinimalRebuild>
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+     </ClCompile>
+     <Link>
+       <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -2278,6 +2281,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <SDLCheck>false</SDLCheck>
++      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+     </ClCompile>
+     <Link>
+       <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -2549,6 +2553,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+     </ClCompile>
+     <Lib>
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -2638,6 +2643,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <SDLCheck>false</SDLCheck>
++      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+     </ClCompile>
+     <Lib>
+       <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
+@@ -2916,6 +2922,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+@@ -3011,6 +3018,7 @@ del /f /q $(OutDir)\licenses\gmp.txt
+       <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+       <DisableSpecificWarnings>4244;4146;4101;4018;4307;4267;4334;4554;4267;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
+       <SDLCheck>false</SDLCheck>
++      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+     </ClCompile>
+     <Link>
+       <EnableCOMDATFolding>true</EnableCOMDATFolding>
diff --git a/ports/gmp/vs.build.patch b/ports/gmp/vs.build.patch
new file mode 100644
index 000000000..69aba9939
--- /dev/null
+++ b/ports/gmp/vs.build.patch
@@ -0,0 +1,165 @@
+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@