[mpir] Build include files even when building static (#33547)

This commit is contained in:
Frank 2023-09-07 04:05:14 +08:00 committed by GitHub
parent 52716b97ad
commit 13da141b82
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 79 additions and 3 deletions

View File

@ -0,0 +1,69 @@
diff --git a/build.vc/postbuild.bat b/build.vc/postbuild.bat
index de1ed08..e4ecceb 100644
--- a/build.vc/postbuild.bat
+++ b/build.vc/postbuild.bat
@@ -37,12 +37,10 @@ set bin_dir="..\%extn%\%plat%\%conf%\"
set hdr_dir="..\%extn%\%plat%\%conf%\"
rem output parametrers for the MPIR tests
-if /i "%filename%" EQU "mpirxx" goto skip
echo (set ldir=%loc%) > output_params.bat
echo (set libr=%extn%) >> output_params.bat
echo (set plat=%plat%) >> output_params.bat
echo (set conf=%conf%) >> output_params.bat
-:skip
echo copying outputs from %tgt_dir% to %bin_dir%
if not exist %bin_dir% md %bin_dir%
diff --git a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
index 3a23f01..1f44b22 100644
--- a/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
+++ b/build.vc15/lib_mpir_cxx/lib_mpir_cxx.vcxproj
@@ -70,6 +70,11 @@
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">mpirxx</TargetName>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+ <PreBuildEvent>
+ <Command>cd ..\..\build.vc
+prebuild gc Win32 15
+ </Command>
+ </PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -82,6 +87,11 @@ postbuild "$(TargetPath)" 15
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+ <PreBuildEvent>
+ <Command>cd ..\..\build.vc
+prebuild gc Win32 15
+ </Command>
+ </PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -94,6 +104,11 @@ postbuild "$(TargetPath)" 15
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+ <PreBuildEvent>
+ <Command>cd ..\..\build.vc
+prebuild gc Win32 15
+ </Command>
+ </PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,6 +121,11 @@ postbuild "$(TargetPath)" 15
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+ <PreBuildEvent>
+ <Command>cd ..\..\build.vc
+prebuild gc Win32 15
+ </Command>
+ </PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\..\</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;HAVE_CONFIG_H;_WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>

View File

@ -8,7 +8,9 @@ vcpkg_from_github(
REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0 REF cdd444aedfcbb190f00328526ef278428702d56e # 3.0.0
SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc SHA512 f46e45bdba27c9f89953ba23186b694486fd3010bd370ea2de71a4649a2816e716a6520c9baa96936f1884437ef03f92b21c0b1fb5b757beba5a05fed30b2bfc
HEAD_REF master HEAD_REF master
PATCHES enable-runtimelibrary-toggle.patch PATCHES
enable-runtimelibrary-toggle.patch
fix-static-include-files.patch
) )
if(NOT VCPKG_TARGET_IS_WINDOWS) if(NOT VCPKG_TARGET_IS_WINDOWS)

View File

@ -1,7 +1,7 @@
{ {
"name": "mpir", "name": "mpir",
"version-date": "2022-03-02", "version-date": "2022-03-02",
"port-version": 2, "port-version": 3,
"description": "Multiple Precision Integers and Rationals", "description": "Multiple Precision Integers and Rationals",
"homepage": "https://github.com/wbhart/mpir", "homepage": "https://github.com/wbhart/mpir",
"license": null, "license": null,

View File

@ -5506,7 +5506,7 @@
}, },
"mpir": { "mpir": {
"baseline": "2022-03-02", "baseline": "2022-03-02",
"port-version": 2 "port-version": 3
}, },
"mpmcqueue": { "mpmcqueue": {
"baseline": "2021-12-01", "baseline": "2021-12-01",

View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "66630c57080280e1089146536f7d5d21c7504600",
"version-date": "2022-03-02",
"port-version": 3
},
{ {
"git-tree": "de9b5962358546e5cc0d7ac9b6dd9bfba95e1763", "git-tree": "de9b5962358546e5cc0d7ac9b6dd9bfba95e1763",
"version-date": "2022-03-02", "version-date": "2022-03-02",