diff options
| author | Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> | 2021-06-12 00:21:54 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 09:21:54 -0700 |
| commit | 0fa821a46e7035ea790294b5ad7ace69ef56f9bd (patch) | |
| tree | ae3462f2cbe0e419224a9252c98362c740c2ff63 /ports/coolprop/fix-install.patch | |
| parent | 1ca6c59b71dc1ed593adfff2695b6979c6e4928e (diff) | |
| download | vcpkg-0fa821a46e7035ea790294b5ad7ace69ef56f9bd.tar.gz vcpkg-0fa821a46e7035ea790294b5ad7ace69ef56f9bd.zip | |
[coolprop] Fix usage, re-fix installation (#18305)
* [coolprop] Fix usage, re-fix installation
* update version record
* Update ports/coolprop/vcpkg.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update versions/c-/coolprop.json
* Update versions/c-/coolprop.json
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Diffstat (limited to 'ports/coolprop/fix-install.patch')
| -rw-r--r-- | ports/coolprop/fix-install.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/ports/coolprop/fix-install.patch b/ports/coolprop/fix-install.patch new file mode 100644 index 000000000..73732f4db --- /dev/null +++ b/ports/coolprop/fix-install.patch @@ -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}") |