aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Karatarakis <alex@karatarakis.com>2017-05-15 14:52:18 -0700
committerGitHub <noreply@github.com>2017-05-15 14:52:18 -0700
commit7b71ac70fe0ce2c23908d5228cde7f7b04b603cc (patch)
tree64cbb619094a3f9aecd23faf223f75a3dcec0b43
parent38518ad7c35aa26e1d2f15405478e2944a6d6df1 (diff)
parentcb4bb0e8d5ab43a6daf900f486de030ca3014c19 (diff)
downloadvcpkg-7b71ac70fe0ce2c23908d5228cde7f7b04b603cc.tar.gz
vcpkg-7b71ac70fe0ce2c23908d5228cde7f7b04b603cc.zip
Merge pull request #1099 from KindDragon/master
[c-ares] Static linkage fix. Fixes #1096
-rw-r--r--ports/c-ares/portfile.cmake13
1 files changed, 9 insertions, 4 deletions
diff --git a/ports/c-ares/portfile.cmake b/ports/c-ares/portfile.cmake
index 696bb0fbc..4c97ed46e 100644
--- a/ports/c-ares/portfile.cmake
+++ b/ports/c-ares/portfile.cmake
@@ -28,10 +28,15 @@ vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/c-ares")
-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})
+if(VCPKG_CRT_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})
+endif()
vcpkg_copy_pdbs()