diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-11-14 02:13:31 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-14 02:13:31 -0800 |
| commit | 5c9f0ff47324634a9796ed5d6cd7350cb06022c2 (patch) | |
| tree | e87fb355f0e22792782f3bad00b271c9039c7edc | |
| parent | 6ae476dfe7c2efe7d83530e3fb9f2d96bfb9801d (diff) | |
| download | vcpkg-5c9f0ff47324634a9796ed5d6cd7350cb06022c2.tar.gz vcpkg-5c9f0ff47324634a9796ed5d6cd7350cb06022c2.zip | |
[coolprop] Avoid copying entire include/ directory. Add python2 to requirements. Simplify portfile. Fixes #2180.
| -rw-r--r-- | ports/coolprop/CONTROL | 2 | ||||
| -rw-r--r-- | ports/coolprop/portfile.cmake | 36 |
2 files changed, 26 insertions, 12 deletions
diff --git a/ports/coolprop/CONTROL b/ports/coolprop/CONTROL index 22ccaba2c..16cbefe24 100644 --- a/ports/coolprop/CONTROL +++ b/ports/coolprop/CONTROL @@ -1,4 +1,4 @@ Source: coolprop -Version: 6.1.0-1 +Version: 6.1.0-2 Description: Thermophysical properties for the masses Build-Depends: catch, eigen3, pybind11, if97, fmt, rapidjson, msgpack, refprop-headers diff --git a/ports/coolprop/portfile.cmake b/ports/coolprop/portfile.cmake index 9e0c2274e..2e8c61005 100644 --- a/ports/coolprop/portfile.cmake +++ b/ports/coolprop/portfile.cmake @@ -9,12 +9,27 @@ vcpkg_from_github( HEAD_REF master ) +vcpkg_find_acquire_program(PYTHON2) +get_filename_component(PYTHON2_DIR ${PYTHON2} DIRECTORY) +set(ENV{PATH} "$ENV{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 @@ -26,8 +41,15 @@ file(COPY ) file(COPY - ${CURRENT_INSTALLED_DIR}/include - DESTINATION ${SOURCE_PATH}/externals/msgpack-c + ${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 @@ -43,8 +65,6 @@ file(APPEND 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} @@ -52,18 +72,12 @@ vcpkg_configure_cmake( 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_RELEASE=ON - OPTIONS_DEBUG - -DCOOLPROP_DEBUG=ON ) vcpkg_install_cmake() vcpkg_copy_pdbs() -if(${VCPKG_LIBRARY_LINKAGE} STREQUAL "dynamic") +if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic") set(TARGET_FOLDER "shared_library") else() set(TARGET_FOLDER "static_library") |