early-access version 2853
This commit is contained in:
pineappleEA
13
externals/vcpkg/ports/coolprop/fix-builderror.patch
vendored
Executable file
13
externals/vcpkg/ports/coolprop/fix-builderror.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/src/ODEIntegrators.cpp b/src/ODEIntegrators.cpp
|
||||
index 4152f01..e5986ca 100644
|
||||
--- a/src/ODEIntegrators.cpp
|
||||
+++ b/src/ODEIntegrators.cpp
|
||||
@@ -4,6 +4,8 @@
|
||||
#include "CPstrings.h"
|
||||
#include "Exceptions.h"
|
||||
#include <algorithm>
|
||||
+#undef max
|
||||
+#undef min
|
||||
|
||||
bool ODEIntegrators::AdaptiveRK54(AbstractODEIntegrator &ode, double tstart, double tend, double hmin, double hmax, double eps_allowed, double step_relax)
|
||||
{
|
||||
19
externals/vcpkg/ports/coolprop/fix-dependency.patch
vendored
Executable file
19
externals/vcpkg/ports/coolprop/fix-dependency.patch
vendored
Executable file
@@ -0,0 +1,19 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 2d61aff..80ac50a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -237,10 +237,10 @@ list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/Tests/CoolProp-Te
|
||||
list(REMOVE_ITEM APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/src/CoolPropLib.cpp")
|
||||
|
||||
set (APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}")
|
||||
-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/Eigen")
|
||||
-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/msgpack-c/include")
|
||||
-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib/include")
|
||||
-list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/externals/fmtlib") # should be deprecated
|
||||
+find_package(Eigen3 CONFIG REQUIRED)
|
||||
+find_package(msgpack CONFIG REQUIRED)
|
||||
+find_package(fmt CONFIG REQUIRED)
|
||||
+link_libraries(Eigen3::Eigen msgpackc msgpackc-cxx fmt::fmt)
|
||||
list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include")
|
||||
list (APPEND APP_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/src")
|
||||
|
||||
31
externals/vcpkg/ports/coolprop/fix-install.patch
vendored
Executable file
31
externals/vcpkg/ports/coolprop/fix-install.patch
vendored
Executable file
@@ -0,0 +1,31 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 80ac50a..36819dd 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -493,13 +493,13 @@ IF ( COOLPROP_OBJECT_LIBRARY OR COOLPROP_STATIC_LIBRARY OR COOLPROP_SHARED_LIBRA
|
||||
SET_PROPERTY(TARGET ${LIB_NAME} PROPERTY RELEASE_POSTFIX )
|
||||
modify_msvc_flags("/MD") # Note that the default is not used if ${COOLPROP_MSVC_REL} or ${COOLPROP_MSVC_DBG} is set
|
||||
ENDIF (MSVC)
|
||||
- INSTALL(TARGETS ${LIB_NAME} DESTINATION static_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit_${CMAKE_CXX_COMPILER_ID}_${CMAKE_CXX_COMPILER_VERSION} )
|
||||
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION static_library)
|
||||
+ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include)
|
||||
ELSEIF (COOLPROP_SHARED_LIBRARY)
|
||||
LIST(APPEND APP_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_SOURCE}")
|
||||
ADD_LIBRARY(${LIB_NAME} SHARED ${APP_SOURCES} ${COOLPROP_LIBRARY_EXPORTS})
|
||||
- INSTALL(TARGETS ${LIB_NAME} DESTINATION shared_library/${CMAKE_SYSTEM_NAME}/${BITNESS}bit${CONVENTION} )
|
||||
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION shared_library)
|
||||
+ INSTALL(TARGETS ${LIB_NAME} RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COOLPROP_LIBRARY_HEADER} DESTINATION include)
|
||||
SET_PROPERTY (TARGET ${LIB_NAME} APPEND_STRING PROPERTY COMPILE_FLAGS " -DCOOLPROP_LIB")
|
||||
# Now all the compiler specific settings for Visual Studio
|
||||
IF (MSVC)
|
||||
@@ -732,7 +732,7 @@ if (COOLPROP_EES_MODULE)
|
||||
VERBATIM
|
||||
)
|
||||
# install the generated library and the other files
|
||||
- install(TARGETS COOLPROP_EES DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}")
|
||||
+ install(TARGETS COOLPROP_EES RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.htm" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}")
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp.LIB" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}")
|
||||
install(FILES "${CMAKE_CURRENT_SOURCE_DIR}/wrappers/EES/CoolProp_EES_Sample.EES" DESTINATION "${CMAKE_INSTALL_PREFIX}/EES/${CMAKE_SYSTEM_NAME}")
|
||||
39
externals/vcpkg/ports/coolprop/fmt-fix.patch
vendored
Executable file
39
externals/vcpkg/ports/coolprop/fmt-fix.patch
vendored
Executable file
@@ -0,0 +1,39 @@
|
||||
diff --git a/include/CPstrings.h b/include/CPstrings.h
|
||||
index b99820a..fe6a2aa 100644
|
||||
--- a/include/CPstrings.h
|
||||
+++ b/include/CPstrings.h
|
||||
@@ -6,6 +6,8 @@
|
||||
#include <algorithm>
|
||||
#include <functional>
|
||||
#include <cctype>
|
||||
+ #include <vector>
|
||||
+ #include <string>
|
||||
|
||||
#if !defined(NO_FMTLIB)
|
||||
#ifndef FMT_HEADER_ONLY
|
||||
@@ -14,9 +16,6 @@
|
||||
#include "fmt/format.h" // For addition of the string formatting functions and macros from fmtlib
|
||||
#include "fmt/printf.h" // For sprintf
|
||||
#undef FMT_HEADER_ONLY
|
||||
-#else
|
||||
- #include <vector>
|
||||
- #include <string>
|
||||
#endif
|
||||
|
||||
#include "Exceptions.h"
|
||||
@@ -58,11 +57,11 @@
|
||||
// Missing string formatting function, this old guy is needed for ancient gcc compilers on PowerPC for VxWorks
|
||||
inline std::string format(const char* fmt, ...);
|
||||
#else
|
||||
- // Missing std::string formatting function - provided by the fmtlib library
|
||||
- inline std::string format(const char *format, fmt::ArgList args) {
|
||||
- return fmt::sprintf(format, args);
|
||||
+ template<class...Args>
|
||||
+ std::string format(const Args & ... args)
|
||||
+ {
|
||||
+ return fmt::sprintf(args...);
|
||||
}
|
||||
- FMT_VARIADIC(std::string, format, const char *)
|
||||
// For latest FMTLIB
|
||||
/*template <typename... Args>
|
||||
inline std::string format(const char *format_str, const Args & ... args) {
|
||||
102
externals/vcpkg/ports/coolprop/portfile.cmake
vendored
Executable file
102
externals/vcpkg/ports/coolprop/portfile.cmake
vendored
Executable file
@@ -0,0 +1,102 @@
|
||||
set(PORT_VERSION 6.1.0)
|
||||
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO CoolProp/CoolProp
|
||||
REF f5ebb4e655add4c23bb327ab5209f3dbf919bc6d # v6.4.1
|
||||
SHA512 916d00777fe56035171ed0a6cbe09b8d4487317772802e4fe9b43f5965f3212dcb3754e18fe1db9c748a4d17facbbe6cb2244451cf5cf66334465760fc1701b7
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
fmt-fix.patch
|
||||
fix-builderror.patch
|
||||
fix-dependency.patch
|
||||
fix-install.patch
|
||||
)
|
||||
|
||||
vcpkg_find_acquire_program(PYTHON2)
|
||||
get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY)
|
||||
vcpkg_add_to_path(${PYTHON2_DIR})
|
||||
|
||||
file(REMOVE_RECURSE ${SOURCE_PATH}/externals)
|
||||
|
||||
# Patch up the file locations
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/catch.hpp
|
||||
DESTINATION ${SOURCE_PATH}/externals/Catch/single_include
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/eigen3/Eigen
|
||||
DESTINATION ${SOURCE_PATH}/externals/Eigen
|
||||
)
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/eigen3/unsupported/Eigen
|
||||
DESTINATION ${SOURCE_PATH}/externals/Eigen/unsupported
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/rapidjson
|
||||
DESTINATION ${SOURCE_PATH}/externals/rapidjson/include
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/IF97.h
|
||||
DESTINATION ${SOURCE_PATH}/externals/IF97
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/msgpack.h
|
||||
${CURRENT_INSTALLED_DIR}/include/msgpack.hpp
|
||||
${CURRENT_INSTALLED_DIR}/include/msgpack
|
||||
DESTINATION ${SOURCE_PATH}/externals/msgpack-c/include
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/fmt
|
||||
DESTINATION ${SOURCE_PATH}/externals/cppformat
|
||||
)
|
||||
|
||||
file(COPY
|
||||
${CURRENT_INSTALLED_DIR}/include/REFPROP_lib.h
|
||||
DESTINATION ${SOURCE_PATH}/externals/REFPROP-headers/
|
||||
)
|
||||
|
||||
# Use a nasty hack to include the correct header
|
||||
file(APPEND
|
||||
${SOURCE_PATH}/externals/msgpack-c/include/fmt/format.h
|
||||
"#include \"fmt/printf.h\""
|
||||
)
|
||||
|
||||
string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "dynamic" COOLPROP_SHARED_LIBRARY)
|
||||
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
|
||||
OPTIONS
|
||||
-DCOOLPROP_SHARED_LIBRARY=${COOLPROP_SHARED_LIBRARY}
|
||||
-DCOOLPROP_STATIC_LIBRARY=${COOLPROP_STATIC_LIBRARY}
|
||||
-DCOOLPROP_MSVC_DYNAMIC=${COOLPROP_MSVC_DYNAMIC}
|
||||
-DCOOLPROP_MSVC_STATIC=${COOLPROP_MSVC_STATIC}
|
||||
OPTIONS_RELEASE
|
||||
-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}
|
||||
OPTIONS_DEBUG
|
||||
-DCOOLPROP_INSTALL_PREFIX=${CURRENT_PACKAGES_DIR}/debug
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
vcpkg_copy_pdbs()
|
||||
|
||||
if (VCPKG_TARGET_IS_WINDOWS AND COOLPROP_SHARED_LIBRARY)
|
||||
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CoolPropLib.h
|
||||
"#if defined(COOLPROP_LIB)" "#if 1"
|
||||
)
|
||||
endif()
|
||||
|
||||
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
|
||||
17
externals/vcpkg/ports/coolprop/vcpkg.json
vendored
Executable file
17
externals/vcpkg/ports/coolprop/vcpkg.json
vendored
Executable file
@@ -0,0 +1,17 @@
|
||||
{
|
||||
"name": "coolprop",
|
||||
"version-semver": "6.4.1",
|
||||
"port-version": 1,
|
||||
"description": "Thermophysical properties for the masses",
|
||||
"homepage": "https://github.com/CoolProp/CoolProp",
|
||||
"dependencies": [
|
||||
"catch",
|
||||
"eigen3",
|
||||
"fmt",
|
||||
"if97",
|
||||
"msgpack",
|
||||
"pybind11",
|
||||
"rapidjson",
|
||||
"refprop-headers"
|
||||
]
|
||||
}
|
||||
Reference in New Issue
Block a user