mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 15:19:00 +08:00
8d1bb02da0
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>
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
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
|
|
@@ -564,8 +564,9 @@
|
|
"$(INSTALLTOP)\include\openssl"
|
|
@"$(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)"
|
|
@"$(PERL)" "$(SRCDIR)\util\mkdir-p.pl" "$(CMAKECONFIGDIR)"
|
|
@"$(PERL)" "$(SRCDIR)\util\copy.pl" $(INSTALL_EXPORTERS_CMAKE) "$(CMAKECONFIGDIR)"
|
|
|
|
@@ -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)"=="" \
|