зеркало из https://github.com/microsoft/vcpkg.git
[openssl] Enforce cmd for nmake (#37716)
Fixes https://github.com/microsoft/vcpkg/issues/37134. Fixes https://github.com/microsoft/vcpkg/issues/35949.
This commit is contained in:
Родитель
be9eb66945
Коммит
84e008654e
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"name": "openssl",
|
"name": "openssl",
|
||||||
"version": "3.2.1",
|
"version": "3.2.1",
|
||||||
"port-version": 1,
|
"port-version": 2,
|
||||||
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
|
"description": "OpenSSL is an open source project that provides a robust, commercial-grade, and full-featured toolkit for the Transport Layer Security (TLS) and Secure Sockets Layer (SSL) protocols. It is also a general-purpose cryptography library.",
|
||||||
"homepage": "https://www.openssl.org",
|
"homepage": "https://www.openssl.org",
|
||||||
"license": "Apache-2.0",
|
"license": "Apache-2.0",
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
# Need cmd to pass quoted CC from nmake to mkbuildinf.pl, GH-37134
|
||||||
|
find_program(CMD_EXECUTABLE cmd HINTS ENV PATH NO_DEFAULT_PATH REQUIRED)
|
||||||
|
cmake_path(NATIVE_PATH CMD_EXECUTABLE cmd)
|
||||||
|
set(ENV{COMSPEC} "${cmd}")
|
||||||
|
|
||||||
vcpkg_find_acquire_program(PERL)
|
vcpkg_find_acquire_program(PERL)
|
||||||
get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
|
get_filename_component(PERL_EXE_PATH "${PERL}" DIRECTORY)
|
||||||
vcpkg_add_to_path("${PERL_EXE_PATH}")
|
vcpkg_add_to_path("${PERL_EXE_PATH}")
|
||||||
|
|
|
@ -6486,7 +6486,7 @@
|
||||||
},
|
},
|
||||||
"openssl": {
|
"openssl": {
|
||||||
"baseline": "3.2.1",
|
"baseline": "3.2.1",
|
||||||
"port-version": 1
|
"port-version": 2
|
||||||
},
|
},
|
||||||
"openssl-unix": {
|
"openssl-unix": {
|
||||||
"baseline": "deprecated",
|
"baseline": "deprecated",
|
||||||
|
|
|
@ -1,5 +1,10 @@
|
||||||
{
|
{
|
||||||
"versions": [
|
"versions": [
|
||||||
|
{
|
||||||
|
"git-tree": "4d41de10fe318363c031b97457b7b6d473020a18",
|
||||||
|
"version": "3.2.1",
|
||||||
|
"port-version": 2
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"git-tree": "3dc6df970a3aff9c977032299e481fd9872e0970",
|
"git-tree": "3dc6df970a3aff9c977032299e481fd9872e0970",
|
||||||
"version": "3.2.1",
|
"version": "3.2.1",
|
||||||
|
|
Загрузка…
Ссылка в новой задаче