[coolprop] use python3 (#27094)

This commit is contained in:
autoantwort 2022-10-06 00:03:50 +02:00 committed by GitHub
parent 4b6d101cc3
commit 45fb2215a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 10 deletions

View File

@ -13,9 +13,9 @@ vcpkg_from_github(
fix-install.patch
)
vcpkg_find_acquire_program(PYTHON2)
get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY)
vcpkg_add_to_path(${PYTHON2_DIR})
vcpkg_find_acquire_program(PYTHON3)
get_filename_component(PYTHON3_DIR ${PYTHON3} DIRECTORY)
vcpkg_add_to_path(${PYTHON3_DIR})
file(REMOVE_RECURSE ${SOURCE_PATH}/externals)
@ -73,9 +73,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "dynamic" COOLPROP_MSVC_DYNAMIC)
string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" COOLPROP_MSVC_STATIC)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
-DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY}
-DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY}
@ -87,7 +86,7 @@ vcpkg_configure_cmake(
-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
)
vcpkg_install_cmake()
vcpkg_cmake_install()
vcpkg_copy_pdbs()
if (VCPKG_TARGET_IS_WINDOWS AND COOLPROP_SHARED_LIBRARY)

View File

@ -1,9 +1,10 @@
{
"name": "coolprop",
"version-semver": "6.4.1",
"port-version": 1,
"port-version": 2,
"description": "Thermophysical properties for the masses",
"homepage": "https://github.com/CoolProp/CoolProp",
"license": "MIT",
"dependencies": [
"catch",
"eigen3",
@ -12,6 +13,10 @@
"msgpack",
"pybind11",
"rapidjson",
"refprop-headers"
"refprop-headers",
{
"name": "vcpkg-cmake",
"host": true
}
]
}

View File

@ -1594,7 +1594,7 @@
},
"coolprop": {
"baseline": "6.4.1",
"port-version": 1
"port-version": 2
},
"coroutine": {
"baseline": "1.5.0",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b66373d8ddd7b8b887779bfb7c132b4000fe4c87",
"version-semver": "6.4.1",
"port-version": 2
},
{
"git-tree": "61676b5a1e9b82c4b88fd3bf37b684f592f9103e",
"version-semver": "6.4.1",