mirror of https://github.com/microsoft/vcpkg.git
[coolprop] Review continued as PR (#50699)
This commit is contained in:
Kai Pastor
GitHub
parent
440fc3e853
commit
30f9f231b0
|
|
@ -1,3 +0,0 @@
|
|||
if(MSVC)
|
||||
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
|
||||
endif()
|
||||
|
|
@ -49,18 +49,7 @@ index 0fa3a454..e1c23875 100644
|
|||
list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
list(APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
||||
|
||||
@@ -361,10 +353,6 @@ set(COOLPROP_INCLUDE_DIRECTORIES
|
||||
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/dev/cmake/Modules/")
|
||||
|
||||
-message(STATUS "Looking for Python")
|
||||
-find_package(Python REQUIRED COMPONENTS Interpreter)
|
||||
-set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
|
||||
-
|
||||
if(CMAKE_DL_LIBS)
|
||||
find_package(${CMAKE_DL_LIBS} REQUIRED)
|
||||
endif()
|
||||
@@ -596,11 +584,12 @@ if(COOLPROP_OBJECT_LIBRARY
|
||||
@@ -596,11 +588,12 @@ if(COOLPROP_OBJECT_LIBRARY
|
||||
endif(MSVC)
|
||||
install(
|
||||
TARGETS ${LIB_NAME}
|
||||
|
|
@ -76,7 +65,7 @@ index 0fa3a454..e1c23875 100644
|
|||
elseif(COOLPROP_SHARED_LIBRARY)
|
||||
list(APPEND APP_SOURCES
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_SOURCE}")
|
||||
@@ -615,10 +604,12 @@ if(COOLPROP_OBJECT_LIBRARY
|
||||
@@ -615,10 +608,12 @@ if(COOLPROP_OBJECT_LIBRARY
|
||||
|
||||
install(
|
||||
TARGETS ${LIB_NAME}
|
||||
|
|
@ -91,7 +80,7 @@ index 0fa3a454..e1c23875 100644
|
|||
set_property(
|
||||
TARGET ${LIB_NAME}
|
||||
APPEND_STRING
|
||||
@@ -960,7 +951,9 @@ if(COOLPROP_EES_MODULE)
|
||||
@@ -960,7 +955,9 @@ if(COOLPROP_EES_MODULE)
|
||||
VERBATIM)
|
||||
# install the generated library and the other files
|
||||
install(TARGETS COOLPROP_EES
|
||||
|
|
|
|||
|
|
@ -1,4 +1,3 @@
|
|||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO CoolProp/CoolProp
|
||||
|
|
@ -12,14 +11,11 @@ vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" "CACHE LIST" "CACHE STRING"
|
|||
|
||||
# Remove bundled externals that are replaced by vcpkg dependencies, keeping known-good bundled ones.
|
||||
file(GLOB externals "${SOURCE_PATH}/externals/*")
|
||||
list(FILTER externals EXCLUDE REGEX "/externals/[.]")
|
||||
list(FILTER externals EXCLUDE REGEX "/externals/incbin$")
|
||||
file(REMOVE_RECURSE ${externals})
|
||||
file(COPY "${CURRENT_INSTALLED_DIR}/include/IF97.h" DESTINATION "${SOURCE_PATH}/externals/IF97")
|
||||
file(COPY "${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h" DESTINATION "${SOURCE_PATH}/externals/REFPROP-headers/")
|
||||
file(COPY "${CURRENT_INSTALLED_DIR}/include/rapidjson" DESTINATION "${SOURCE_PATH}/externals/rapidjson/include")
|
||||
# Fix GCC warning when thread_local is substitude as __thread
|
||||
vcpkg_replace_string("${SOURCE_PATH}/externals/rapidjson/include/rapidjson/document.h" "thread_local static " "static thread_local ")
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY)
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" COOLPROP_STATIC_LIBRARY)
|
||||
|
|
@ -33,12 +29,12 @@ vcpkg_cmake_configure(
|
|||
SOURCE_PATH "${SOURCE_PATH}"
|
||||
DISABLE_PARALLEL_CONFIGURE
|
||||
OPTIONS
|
||||
"-DCMAKE_PROJECT_INCLUDE=${CMAKE_CURRENT_LIST_DIR}/cmake-project-include.cmake"
|
||||
-DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY}
|
||||
-DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY}
|
||||
-DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC}
|
||||
-DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC}
|
||||
"-DPYTHON_EXECUTABLE=${PYTHON3}"
|
||||
-DFORCE_BITNESS_NATIVE=ON # follow toolchain properties
|
||||
"-DPython_EXECUTABLE=${PYTHON3}"
|
||||
OPTIONS_RELEASE
|
||||
"-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}"
|
||||
OPTIONS_DEBUG
|
||||
|
|
@ -56,5 +52,4 @@ endif()
|
|||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Handle copyright
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
{
|
||||
"name": "coolprop",
|
||||
"version-semver": "7.2.0",
|
||||
"port-version": 1,
|
||||
"description": "Thermophysical properties for the masses",
|
||||
"homepage": "https://github.com/CoolProp/CoolProp",
|
||||
"license": "MIT",
|
||||
|
|
|
|||
|
|
@ -122,7 +122,6 @@ cmake:arm64-linux=fail
|
|||
coin:arm64-linux=fail
|
||||
coin-or-ipopt:x64-windows-static-md=fail
|
||||
coin-or-ipopt:x64-windows-static=fail
|
||||
coolprop:arm64-linux=fail
|
||||
coroutine:arm-neon-android=fail
|
||||
coroutine:arm64-android=fail
|
||||
coroutine:arm64-osx=fail
|
||||
|
|
|
|||
|
|
@ -216,7 +216,6 @@ coinutils:arm64-linux=cascade
|
|||
colmap:arm64-linux=cascade
|
||||
colmap[cuda,cuda-redist]:x64-linux=feature-fails
|
||||
colmap[cuda,cuda-redist](arm64 & osx)=cascade
|
||||
coolprop:arm64-linux=fail
|
||||
coroutine:arm64-osx=fail # requires c++20
|
||||
cppadcodegen:arm64-linux=fail
|
||||
cppcoro(linux | osx)=fail
|
||||
|
|
|
|||
|
|
@ -1982,7 +1982,7 @@
|
|||
},
|
||||
"coolprop": {
|
||||
"baseline": "7.2.0",
|
||||
"port-version": 0
|
||||
"port-version": 1
|
||||
},
|
||||
"copypp": {
|
||||
"baseline": "0.3.0",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "c21f4947f89af876d939e0d3c337c059633e29f8",
|
||||
"version-semver": "7.2.0",
|
||||
"port-version": 1
|
||||
},
|
||||
{
|
||||
"git-tree": "be29bbedc0134174762fc388ce0d2fa1ecc5ad3f",
|
||||
"version-semver": "7.2.0",
|
||||
|
|
|
|||
Loading…
Reference in New Issue