Mirrors/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2026-01-18 01:11:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add VCPKG_TARGET_IS_BSD and VCPKG_HOST_IS_BSD (#47309)

Browse Source
This commit is contained in:
CQ_Undefine
2025-09-30 20:12:13 +02:00
committed by GitHub
parent 9d7431c33f
commit 4927a24f00
8 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vcpkg-make/vcpkg.json
View File

@@ -1,6 +1,6 @@
{
"name": "vcpkg-make",
"version-date": "2025-09-19",
"version-date": "2025-09-29",
"documentation": "https://learn.microsoft.com/vcpkg/maintainers/functions/vcpkg_make_configure",
"license": null,
"supports": "native",

2
ports/vcpkg-make/vcpkg_make_configure.cmake
View File

@@ -133,7 +133,7 @@ function(vcpkg_make_configure)
EMMAKEN_JUST_CONFIGURE
)
if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
if(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
else()
find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED)

2
ports/vcpkg-make/vcpkg_make_install.cmake
View File

@@ -41,7 +41,7 @@ function(vcpkg_make_install)
vcpkg_make_get_shell(shell_var)
set(shell_cmd "${shell_var}")
if(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
if(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
else()
find_program(Z_VCPKG_MAKE NAMES make gmake NAMES_PER_DIR REQUIRED)

4
scripts/cmake/vcpkg_common_definitions.cmake
View File

@@ -21,8 +21,10 @@ elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Android")
set(VCPKG_TARGET_IS_ANDROID ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
set(VCPKG_TARGET_IS_FREEBSD ON)
set(VCPKG_TARGET_IS_BSD ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
set(VCPKG_TARGET_IS_OPENBSD ON)
set(VCPKG_TARGET_IS_BSD ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "SunOS")
set(VCPKG_TARGET_IS_SOLARIS ON)
elseif(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "MinGW")
@@ -41,8 +43,10 @@ elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "Linux")
set(VCPKG_HOST_IS_LINUX ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")
set(VCPKG_HOST_IS_FREEBSD ON)
set(VCPKG_HOST_IS_BSD ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "OpenBSD")
set(VCPKG_HOST_IS_OPENBSD ON)
set(VCPKG_HOST_IS_BSD ON)
elseif(CMAKE_HOST_SYSTEM_NAME STREQUAL "SunOS")
set(VCPKG_HOST_IS_SOLARIS ON)
endif()

2
scripts/cmake/vcpkg_configure_make.cmake
View File

@@ -900,7 +900,7 @@ function(vcpkg_configure_make)
# Export matching make program for vcpkg_build_make (cache variable)
if(CMAKE_HOST_WIN32 AND MSYS_ROOT)
find_program(Z_VCPKG_MAKE make PATHS "${MSYS_ROOT}/usr/bin" NO_DEFAULT_PATH REQUIRED)
elseif(VCPKG_HOST_IS_FREEBSD OR VCPKG_HOST_IS_OPENBSD)
elseif(VCPKG_HOST_IS_BSD)
find_program(Z_VCPKG_MAKE gmake REQUIRED)
elseif(VCPKG_HOST_IS_SOLARIS)
find_program(Z_VCPKG_MAKE NAMES gmake make REQUIRED)

2
scripts/ports.cmake
View File

@@ -212,7 +212,7 @@ target system or to the host system. Use a prefixed variable instead.
if(DEFINED PORT)
# Always fixup RPATH on linux, osx and bsds unless explicitly disabled.
if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_FREEBSD OR VCPKG_TARGET_IS_OPENBSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH))
if(VCPKG_FIXUP_ELF_RPATH OR ((VCPKG_TARGET_IS_LINUX OR VCPKG_TARGET_IS_BSD) AND NOT DEFINED VCPKG_FIXUP_ELF_RPATH))
z_vcpkg_fixup_rpath_in_dir()
endif()
if(VCPKG_FIXUP_MACHO_RPATH OR (VCPKG_TARGET_IS_OSX AND NOT DEFINED VCPKG_FIXUP_MACHO_RPATH))

2
versions/baseline.json
View File

@@ -10077,7 +10077,7 @@
"port-version": 0
},
"vcpkg-make": {
"baseline": "2025-09-19",
"baseline": "2025-09-29",
"port-version": 0
},
"vcpkg-msbuild": {

5
versions/v-/vcpkg-make.json
View File

@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "73a90e27dfaf176bb25ec339e8b3077054de52da",
"version-date": "2025-09-29",
"port-version": 0
},
{
"git-tree": "11501b3c7cff0f97a1c3e0200ff1b3c6d043e643",
"version-date": "2025-09-19",