aboutsummaryrefslogtreecommitdiff
path: root/ports/cryptopp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2016-11-08 15:27:59 -0800
committerAlexander Karatarakis <alkarata@microsoft.com>2016-11-08 15:27:59 -0800
commit68d4a4c4bc0309dcac61752a871f84633a211777 (patch)
treebe450dbab493740a63971b3474963088a033c12a /ports/cryptopp
parente9ddf167b19fb63dd4defaddcfe4cae2f6c223ca (diff)
parentdbab03a1a82913ae96bfa3c1613ade20b5ac438d (diff)
downloadvcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.tar.gz
vcpkg-68d4a4c4bc0309dcac61752a871f84633a211777.zip
Merge branch 'master' into ericmitt
Diffstat (limited to 'ports/cryptopp')
-rw-r--r--ports/cryptopp/portfile.cmake8
1 files changed, 4 insertions, 4 deletions
diff --git a/ports/cryptopp/portfile.cmake b/ports/cryptopp/portfile.cmake
index 1fc1e4ebd..4847c208b 100644
--- a/ports/cryptopp/portfile.cmake
+++ b/ports/cryptopp/portfile.cmake
@@ -1,6 +1,6 @@
-include(${CMAKE_TRIPLET_FILE})
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
- message(FATAL_ERROR "Dynamic building not supported") # See note below
+ message(STATUS "Warning: Dynamic building not supported. Building static.") # See note below
+ set(VCPKG_LIBRARY_LINKAGE static)
endif()
include(vcpkg_common_functions)
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/cryptopp-CRYPTOPP_5_6_5)
@@ -37,8 +37,8 @@ file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/cryptest.exe)
file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/cryptest.exe)
# Remove other files not required in package
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
-file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/lib/cmake)
# Handle copyright
file(COPY ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/cryptopp)