3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-27 10:21:07 +08:00
Code Issues Projects Releases Wiki Activity

[Physx] fix single config builds (#42734)

Browse Source
This commit is contained in:
Alexander Neumann 2024-12-16 16:14:53 +01:00 committed by GitHub
parent 1c753cf99b
commit 10474e022c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ports/physx/portfile.cmake
View File

@ -173,6 +173,7 @@ endif()
set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams}) set(cmakeParams ${platformCMakeParams} ${common_params} ${cmakeParams})
# Finally invoke cmake to configure the PhysX project # Finally invoke cmake to configure the PhysX project
vcpkg_cmake_configure( vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public" SOURCE_PATH "${SOURCE_PATH}/physx/compiler/public"
@ -218,17 +219,23 @@ function(copy_in_vcpkg_destination_folder_physx_artifacts)
cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN}) cmake_parse_arguments(_fpa "" "DIRECTORY" "SUFFIXES" ${ARGN})
_copy_up("bin/*/release" "${_fpa_DIRECTORY}") # could be physx/bin/linux.clang/release or physx/bin/win.x86_64.vc142.mt/release _copy_up("bin/*/release" "${_fpa_DIRECTORY}") # could be physx/bin/linux.clang/release or physx/bin/win.x86_64.vc142.mt/release
if(NOT VCPKG_BUILD_TYPE)
_copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}") _copy_up("bin/*/debug" "debug/${_fpa_DIRECTORY}")
endif()
endfunction() endfunction()
# Create output directories # Create output directories
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/lib")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/lib")
endif()
if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static") if(NOT VCPKG_LIBRARY_LINKAGE STREQUAL "static")
# Packman also downloads the Gpu driver shared library, so we'll place it in bin and debug/bin # Packman also downloads the Gpu driver shared library, so we'll place it in bin and debug/bin
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/bin")
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/bin")
endif() endif()
endif()
copy_in_vcpkg_destination_folder_physx_artifacts( copy_in_vcpkg_destination_folder_physx_artifacts(
DIRECTORY "lib" DIRECTORY "lib"
@ -288,8 +295,10 @@ file(REMOVE_RECURSE
# Install the cmake config that users will use, replace -if any- only @variables@ # Install the cmake config that users will use, replace -if any- only @variables@
configure_file("${CMAKE_CURRENT_LIST_DIR}/omniverse-physx-sdk-config.cmake" "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk/unofficial-omniverse-physx-sdk-config.cmake" @ONLY) configure_file("${CMAKE_CURRENT_LIST_DIR}/omniverse-physx-sdk-config.cmake" "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk/unofficial-omniverse-physx-sdk-config.cmake" @ONLY)
if(NOT VCPKG_BUILD_TYPE)
file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/debug/share")
file(COPY "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/") file(COPY "${CURRENT_PACKAGES_DIR}/share/omniverse-physx-sdk" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share/")
endif()
vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-omniverse-physx-sdk vcpkg_cmake_config_fixup(PACKAGE_NAME unofficial-omniverse-physx-sdk
CONFIG_PATH share/omniverse-physx-sdk) CONFIG_PATH share/omniverse-physx-sdk)

1
ports/physx/vcpkg.json
View File

@ -1,6 +1,7 @@
{ {
"name": "physx", "name": "physx",
"version": "5.3.0", "version": "5.3.0",
"port-version": 1,
"description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.", "description": "The NVIDIA PhysX SDK is a scalable multi-platform physics solution supporting a wide range of devices, from smartphones to high-end multicore CPUs and GPUs. This is the latest NVIDIA official version of the PhysX engine which also directly integrates into Omniverse. This port is NOT officially supported by NVIDIA.",
"homepage": "https://github.com/NVIDIA-Omniverse/PhysX", "homepage": "https://github.com/NVIDIA-Omniverse/PhysX",
"license": "BSD-3-Clause", "license": "BSD-3-Clause",

2
versions/baseline.json
View File

@ -7002,7 +7002,7 @@
}, },
"physx": { "physx": {
"baseline": "5.3.0", "baseline": "5.3.0",
"port-version": 0 "port-version": 1
}, },
"picojson": { "picojson": {
"baseline": "1.3.0", "baseline": "1.3.0",

5
versions/p-/physx.json
View File

@ -1,5 +1,10 @@
{ {
"versions": [ "versions": [
{
"git-tree": "12d1fb56ea7b2f016019fdf621b1246456f0411a",
"version": "5.3.0",
"port-version": 1
},
{ {
"git-tree": "890453e6b337c77f35dbb33620ac0ab32113f22f", "git-tree": "890453e6b337c77f35dbb33620ac0ab32113f22f",
"version": "5.3.0", "version": "5.3.0",