mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-05 02:59:02 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3b7d84b77f
vcpkg/ports/openssl/windows/install-pdbs.patch

47 lines
2.1 KiB
Diff
Raw Normal View History

[openssl] Revise jom/nmake support (#27150) * Use vcpkg_build_nmake for windows incl. uwp Use prerun shell for configuration * [openssl] Generate OPENSSL_VERSION_MAJOR/MINOR/FIX * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-12 06:12:15 +08:00
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 5946c89..f71f3bf 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
[openssl] Update to 3.3.0, limited cmake config fixup (#38173) Based on #38118, credits: @talregev. OpenSSL now installs a CMake config, but it is not generated by CMake, and it is not multi-config capable. This limitation affects location properties, interface link libraries and package variables. This PR just patches the config to chainload CMake's Find module. Together with vcpkg's cmake wrapper, this immediately gives the desired imported targets in a multi-config configuration when a user really requests `OpenSSL CONFIG`. --------- Co-authored-by: Tal Regev <tal.regev@gmail.com>
2024-04-16 02:18:29 +08:00
@@ -564,8 +564,9 @@
"$(INSTALLTOP)\include\openssl"
[openssl] Revise jom/nmake support (#27150) * Use vcpkg_build_nmake for windows incl. uwp Use prerun shell for configuration * [openssl] Generate OPENSSL_VERSION_MAJOR/MINOR/FIX * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-12 06:12:15 +08:00
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(libdir)"
@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_LIBS) "$(libdir)"
@if "$(SHLIBS)"=="" \
+ @if "$(INSTALL_PDBS)"=="ON" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" ossl_static.pdb "$(libdir)"
[openssl] Update to 3.3.0, limited cmake config fixup (#38173) Based on #38118, credits: @talregev. OpenSSL now installs a CMake config, but it is not generated by CMake, and it is not multi-config capable. This limitation affects location properties, interface link libraries and package variables. This PR just patches the config to chainload CMake's Find module. Together with vcpkg's cmake wrapper, this immediately gives the desired imported targets in a multi-config configuration when a user really requests `OpenSSL CONFIG`. --------- Co-authored-by: Tal Regev <tal.regev@gmail.com>
2024-04-16 02:18:29 +08:00
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(CMAKECONFIGDIR)"
@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_EXPORTERS_CMAKE) "$(CMAKECONFIGDIR)"
[openssl] Revise jom/nmake support (#27150) * Use vcpkg_build_nmake for windows incl. uwp Use prerun shell for configuration * [openssl] Generate OPENSSL_VERSION_MAJOR/MINOR/FIX * Update versions Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2022-11-12 06:12:15 +08:00
@@ -569,6 +570,7 @@ install_engines: _install_modules_deps
@if not "$(INSTALL_ENGINES)"=="" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINES) "$(ENGINESDIR)"
@if not "$(INSTALL_ENGINES)"=="" \
+ @if "$(INSTALL_PDBS)"=="ON" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_ENGINEPDBS) "$(ENGINESDIR)"
uninstall_engines:
@@ -580,6 +582,7 @@ install_modules: _install_modules_deps
@if not "$(INSTALL_MODULES)"=="" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_MODULES) "$(MODULESDIR)"
@if not "$(INSTALL_MODULES)"=="" \
+ @if "$(INSTALL_PDBS)"=="ON" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_MODULEPDBS) "$(MODULESDIR)"
uninstall_modules:
@@ -593,6 +596,7 @@ install_runtime_libs: build_libs
@if not "$(SHLIBS)"=="" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBS) "$(INSTALLTOP)\bin"
@if not "$(SHLIBS)"=="" \
+ @if "$(INSTALL_PDBS)"=="ON" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_SHLIBPDBS) \
"$(INSTALLTOP)\bin"
@@ -605,6 +609,7 @@ install_programs: install_runtime_libs build_programs
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMS) \
"$(INSTALLTOP)\bin"
@if not "$(INSTALL_PROGRAMS)"=="" \
+ @if "$(INSTALL_PDBS)"=="ON" \
"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_PROGRAMPDBS) \
"$(INSTALLTOP)\bin"
@if not "$(INSTALL_PROGRAMS)"=="" \
Reference in New Issue Copy Permalink