Merge branch 'master' of https://github.com/Microsoft/vcpkg into qca

6 files changed, 90 insertions, 10 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
new file mode 100644
index 000000000..bfeed7a0b
--- /dev/null
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -0,0 +1,3 @@
+Source: aws-sdk-cpp
+Version: 1.0.34
+Description: AWS SDK for C++
diff --git a/ports/aws-sdk-cpp/drop_git.patch b/ports/aws-sdk-cpp/drop_git.patch
new file mode 100644
index 000000000..491831bd7
--- /dev/null
+++ b/ports/aws-sdk-cpp/drop_git.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9d2a98a..ce58b68 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -22,7 +22,7 @@ if(CMAKE_MAJOR_VERSION LESS 3)
+ endif()
+ 
+ # git is required for Android builds and optional for all other platforms
+-find_package(Git)
++#find_package(Git)
+ 
+ # Cmake invocation variables:
+ #   CUSTOM_MEMORY_MANAGEMENT - if set to 1, generates the sdk project files with custom memory management enabled, otherwise disables it
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
new file mode 100644
index 000000000..a1f1a40b9
--- /dev/null
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -0,0 +1,55 @@
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.34)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.34.tar.gz"
+    FILENAME "1.0.34.tar.gz"
+    SHA512 21ca03eb323eecb55c29866b73c07956a36aad7c9c051eb7ca201cfd356c3f9732c89898cf0c89660d6c1279dc52438bb389b37d613bf741bae81bb3e773a3c5
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES 
+		${CMAKE_CURRENT_LIST_DIR}/drop_git.patch
+)
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
+	set(FORCE_SHARED_CRT OFF)
+else()
+	set(FORCE_SHARED_CRT ON)
+endif()
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+	OPTIONS
+		-DENABLE_TESTING=OFF
+		-DFORCE_SHARED_CRT=${FORCE_SHARED_CRT}
+)
+
+vcpkg_install_cmake()
+
+file(REMOVE_RECURSE 
+	${CURRENT_PACKAGES_DIR}/debug/include
+	${CURRENT_PACKAGES_DIR}/lib/cmake
+	${CURRENT_PACKAGES_DIR}/lib/pkgconfig
+	${CURRENT_PACKAGES_DIR}/debug/lib/cmake
+	${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig
+	${CURRENT_PACKAGES_DIR}/nuget
+	${CURRENT_PACKAGES_DIR}/debug/nuget)
+
+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})
+	
+	vcpkg_apply_patches( #define USE_IMPORT_EXPORT in SDKConfig.h
+		SOURCE_PATH ${CURRENT_PACKAGES_DIR}/include
+		PATCHES 
+			${CMAKE_CURRENT_LIST_DIR}/shared_define.patch
+	)
+endif()
+
+# Handle copyright
+file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/aws-sdk-cpp RENAME copyright)
\ No newline at end of file
diff --git a/ports/aws-sdk-cpp/shared_define.patch b/ports/aws-sdk-cpp/shared_define.patch
new file mode 100644
index 000000000..96657b33e
--- /dev/null
+++ b/ports/aws-sdk-cpp/shared_define.patch
@@ -0,0 +1,10 @@
+diff --git a/aws/core/SDKConfig.h b/aws/core/SDKConfig.h
+index 130c9dd..66b2630 100644
+--- a/aws/core/SDKConfig.h
++++ b/aws/core/SDKConfig.h
+@@ -17,3 +17,4 @@
+ 
+ #define JSON_USE_EXCEPTION 0
+ 
++#define USE_IMPORT_EXPORT
+\ No newline at end of file
diff --git a/ports/boost/CONTROL b/ports/boost/CONTROL
index 57dfe58e3..91c8496a5 100644
--- a/ports/boost/CONTROL
+++ b/ports/boost/CONTROL
@@ -1,3 +1,3 @@
 Source: boost
-Version: 1.62-6
+Version: 1.62-7
 Description: Peer-reviewed portable C++ source libraries
diff --git a/ports/boost/portfile.cmake b/ports/boost/portfile.cmake
index 7cc0d60b0..67d9096ac 100644
--- a/ports/boost/portfile.cmake
+++ b/ports/boost/portfile.cmake
@@ -36,7 +36,6 @@ set(B2_OPTIONS
     --hash
 
     --without-python
-    --layout=system
     toolset=msvc
     threading=multi
 )
@@ -106,16 +105,16 @@ file(APPEND ${CURRENT_PACKAGES_DIR}/include/boost/config/user.hpp "\n#define BOO
 file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/boost RENAME copyright)
 message(STATUS "Packaging headers done")
 
-function(boost_remove_lib_prefix_from_lib_files LIBS)
+# This function makes the static build lib names match the dynamic build lib names which FindBoost.cmake is looking for by default.
+# It also renames a couple of "libboost" lib files in the dynamic build (for example libboost_exception-vc140-mt-1_62.lib).
+function(boost_rename_libs LIBS)
     foreach(LIB ${${LIBS}})
         get_filename_component(OLD_FILENAME ${LIB} NAME)
         get_filename_component(DIRECTORY_OF_LIB_FILE ${LIB} DIRECTORY)
         string(REPLACE "libboost_" "boost_" NEW_FILENAME ${OLD_FILENAME})
-        if (EXISTS ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-            file(REMOVE ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME})
-        else()
-            file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
-        endif()
+        string(REPLACE "-s-" "-" NEW_FILENAME ${NEW_FILENAME}) # For Release libs
+        string(REPLACE "-sgd-" "-gd-" NEW_FILENAME ${NEW_FILENAME}) # For Debug libs
+        file(RENAME ${DIRECTORY_OF_LIB_FILE}/${OLD_FILENAME} ${DIRECTORY_OF_LIB_FILE}/${NEW_FILENAME})
     endforeach()
 endfunction()
 
@@ -129,7 +128,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         FILES_MATCHING PATTERN "*.dll")
 endif()
 file(GLOB RELEASE_LIBS ${CURRENT_PACKAGES_DIR}/lib/libboost*.lib)
-boost_remove_lib_prefix_from_lib_files(RELEASE_LIBS)
+boost_rename_libs(RELEASE_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-rel done")
 
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg")
@@ -142,7 +141,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
         FILES_MATCHING PATTERN "*.dll")
 endif()
 file(GLOB DEBUG_LIBS ${CURRENT_PACKAGES_DIR}/debug/lib/libboost*.lib)
-boost_remove_lib_prefix_from_lib_files(DEBUG_LIBS)
+boost_rename_libs(DEBUG_LIBS)
 message(STATUS "Packaging ${TARGET_TRIPLET}-dbg done")
 
 vcpkg_copy_pdbs()