diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-06-09 15:39:32 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-06-09 15:39:32 -0700 |
| commit | 2071719138cac9f2e943b129e5a19bef6f16f930 (patch) | |
| tree | 05e45ee5b5bca4ce691109670429d01ad096a7c6 | |
| parent | af3f6a8fd629f659222339e0888de066f6d70855 (diff) | |
| download | vcpkg-2071719138cac9f2e943b129e5a19bef6f16f930.tar.gz vcpkg-2071719138cac9f2e943b129e5a19bef6f16f930.zip | |
[c-ares] Fix support for static/md
| -rw-r--r-- | ports/c-ares/CONTROL | 2 | ||||
| -rw-r--r-- | ports/c-ares/portfile.cmake | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/ports/c-ares/CONTROL b/ports/c-ares/CONTROL index 977066b4c..db04bd3fa 100644 --- a/ports/c-ares/CONTROL +++ b/ports/c-ares/CONTROL @@ -1,4 +1,4 @@ Source: c-ares -Version: 1.12.1-dev-40eb41f +Version: 1.12.1-dev-40eb41f-1 Description: A C library for asynchronous DNS requests Build-Depends:
\ No newline at end of file diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake index 4c97ed46e..86c4ba442 100644 --- a/ports/c-ares/portfile.cmake +++ b/ports/c-ares/portfile.cmake @@ -28,14 +28,17 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares") -if(VCPKG_CRT_LINKAGE STREQUAL static) +if(VCPKG_LIBRARY_LINKAGE STREQUAL static) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) else() - file(GLOB RELEASE_EXE_FILES "${CURRENT_PACKAGES_DIR}/bin/*.exe") - file(REMOVE ${RELEASE_EXE_FILES}) - file(GLOB DEBUG_EXE_FILES "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe") - file(REMOVE ${DEBUG_EXE_FILES}) + file(GLOB EXE_FILES + "${CURRENT_PACKAGES_DIR}/bin/*.exe" + "${CURRENT_PACKAGES_DIR}/debug/bin/*.exe" + ) + if (EXE_FILES) + file(REMOVE ${EXE_FILES}) + endif() endif() vcpkg_copy_pdbs() |