From 865faa40172be0d61166bac87eadc43517463f0b Mon Sep 17 00:00:00 2001 From: sdcb Date: Tue, 29 Nov 2016 11:04:32 +0800 Subject: [aws-sdk] issues occurs in static build, revert code. --- ports/aws-sdk-cpp/portfile.cmake | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake index 6a72cda14..16ba1916c 100644 --- a/ports/aws-sdk-cpp/portfile.cmake +++ b/ports/aws-sdk-cpp/portfile.cmake @@ -1,3 +1,8 @@ +if (VCPKG_LIBRARY_LINKAGE STREQUAL static) + message(STATUS "Warning: Static building not supported yet. Building dynamic.") #Blocked by CRT MD link issue. + set(VCPKG_LIBRARY_LINKAGE dynamic) +endif() + include(vcpkg_common_functions) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.34) vcpkg_download_distfile(ARCHIVE @@ -28,11 +33,13 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/nuget ${CURRENT_PACKAGES_DIR}/debug/nuget) -file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) -file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) -file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) -file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) -file(REMOVE ${LIB_FILES} ${DEBUG_LIB_FILES}) +if(${VCPKG_LIBRARY_LINKAGE} STREQUAL dynamic) + file(GLOB LIB_FILES ${CURRENT_PACKAGES_DIR}/bin/*.lib) + file(GLOB DEBUG_LIB_FILES ${CURRENT_PACKAGES_DIR}/debug/bin/*.lib) + file(COPY ${LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/lib) + file(COPY ${DEBUG_LIB_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) + file(REMOVE ${LIB_FILES} ${DEBUG_LIB_FILES}) +endif() # Handle copyright file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright) \ No newline at end of file -- cgit v1.2.3