Merge branch 'master' into codicodi-ninja-support

15 files changed, 87 insertions, 25 deletions

diff --git a/ports/aws-sdk-cpp/CONTROL b/ports/aws-sdk-cpp/CONTROL
index 989d3a9eb..18de04d46 100644
--- a/ports/aws-sdk-cpp/CONTROL
+++ b/ports/aws-sdk-cpp/CONTROL
@@ -1,3 +1,3 @@
 Source: aws-sdk-cpp
-Version: 1.0.47
+Version: 1.0.61
 Description: AWS SDK for C++
diff --git a/ports/aws-sdk-cpp/disable_warning_as_error.patch b/ports/aws-sdk-cpp/disable_warning_as_error.patch
new file mode 100644
index 000000000..ec5587eb8
--- /dev/null
+++ b/ports/aws-sdk-cpp/disable_warning_as_error.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/compiler_settings.cmake b/cmake/compiler_settings.cmake
+index 36795a2..77334ee 100644
+--- a/cmake/compiler_settings.cmake
++++ b/cmake/compiler_settings.cmake
+@@ -57,7 +57,7 @@ endif()
+ if(MSVC)
+     # warnings as errors, max warning level (4)
+     if(NOT CMAKE_CXX_FLAGS MATCHES "/WX")
+-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
++        #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
+     endif()
+ 
+     # taken from http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
diff --git a/ports/aws-sdk-cpp/portfile.cmake b/ports/aws-sdk-cpp/portfile.cmake
index 5313e85b7..21219c3c9 100644
--- a/ports/aws-sdk-cpp/portfile.cmake
+++ b/ports/aws-sdk-cpp/portfile.cmake
@@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.47)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/aws-sdk-cpp-1.0.61)
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.47.tar.gz"
-    FILENAME "aws-sdk-cpp-1.0.47.tar.gz"
-    SHA512 ce7471bafe2763f1c382eed8afeaf6422058599a3aa11ae52909da668c45d12827fcd06b9b3ce34e3c2fa33297fd2e09421b8a89833d581efaf62b7108232acf
+    URLS "https://github.com/aws/aws-sdk-cpp/archive/1.0.61.tar.gz"
+    FILENAME "aws-sdk-cpp-1.0.61.tar.gz"
+    SHA512 aef0a85a32db24dc4fba0fc49c2533074580f3df628e787ff0808f03deea5dac42e19b1edc966706784e98cfed17a350c3eff4f222df7cc756065be56d1fc6a6
 )
 vcpkg_extract_source_archive(${ARCHIVE})
 
@@ -11,6 +11,7 @@ vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES 
 		${CMAKE_CURRENT_LIST_DIR}/drop_git.patch
+		${CMAKE_CURRENT_LIST_DIR}/disable_warning_as_error.patch
 )
 
 if(VCPKG_CRT_LINKAGE STREQUAL static)
@@ -44,11 +45,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
 	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
-	)
+	file(APPEND ${CURRENT_PACKAGES_DIR}/include/aws/core/SDKConfig.h "#define USE_IMPORT_EXPORT")
 endif()
 
 # Handle copyright
diff --git a/ports/aws-sdk-cpp/shared_define.patch b/ports/aws-sdk-cpp/shared_define.patch
deleted file mode 100644
index 96657b33e..000000000
--- a/ports/aws-sdk-cpp/shared_define.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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/cpprestsdk/CONTROL b/ports/cpprestsdk/CONTROL
index b3438026f..f284f2b53 100644
--- a/ports/cpprestsdk/CONTROL
+++ b/ports/cpprestsdk/CONTROL
@@ -1,5 +1,5 @@
 Source: cpprestsdk
-Version: 2.9.0-1
-Build-Depends: zlib [windows], openssl [windows], boost [windows]
+Version: 2.9.0-2
+Build-Depends: zlib [windows], openssl [windows], boost [windows], websocketpp [windows]
 Description: C++11 JSON, REST, and OAuth library
   The C++ REST SDK is a Microsoft project for cloud-based client-server communication in native code using a modern asynchronous C++ API design. This project aims to help C++ developers connect to and interact with services.
\ No newline at end of file
diff --git a/ports/cpprestsdk/portfile.cmake b/ports/cpprestsdk/portfile.cmake
index d1b5fa7f6..f92c5147a 100644
--- a/ports/cpprestsdk/portfile.cmake
+++ b/ports/cpprestsdk/portfile.cmake
@@ -15,9 +15,13 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/0001_cmake.patch
 )
 
+SET(WEBSOCKETPP_PATH "${CURRENT_INSTALLED_DIR}/share/websocketpp")
+
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}/Release
     OPTIONS
+        -DWEBSOCKETPP_CONFIG=${WEBSOCKETPP_PATH}
+        -DWEBSOCKETPP_CONFIG_VERSION=${WEBSOCKETPP_PATH}
         -DBUILD_TESTS=OFF
         -DBUILD_SAMPLES=OFF
         -DCPPREST_EXCLUDE_WEBSOCKETS=OFF
diff --git a/ports/cuda/CONTROL b/ports/cuda/CONTROL
new file mode 100644
index 000000000..00df3011c
--- /dev/null
+++ b/ports/cuda/CONTROL
@@ -0,0 +1,3 @@
+Source: cuda
+Version: 8.0
+Description: A parallel computing platform and programming model
\ No newline at end of file
diff --git a/ports/cuda/portfile.cmake b/ports/cuda/portfile.cmake
new file mode 100644
index 000000000..3b20afe0f
--- /dev/null
+++ b/ports/cuda/portfile.cmake
@@ -0,0 +1,34 @@
+# Due to the complexity involved, this package doesn't install CUDA. It instead verifies that CUDA is installed.
+# Other packages can depend on this package to declare a dependency on CUDA.
+# If this package is installed, we assume that CUDA is properly installed.
+
+execute_process(
+        COMMAND nvcc --version
+        OUTPUT_VARIABLE NVCC_OUTPUT
+        RESULT_VARIABLE error_code)
+
+# Sample output
+# NVIDIA (R) Cuda compiler driver
+# Copyright (c) 2005-2016 NVIDIA Corporation
+# Built on Sat_Sep__3_19:05:48_CDT_2016
+# Cuda compilation tools, release 8.0, V8.0.44
+set(CUDA_REQUIRED_VERSION "V8.0.0")
+
+if (${error_code})
+    message(FATAL_ERROR "CUDA is not installed. Before continuing, please download and install CUDA  (${CUDA_REQUIRED_VERSION} or higher) from:"
+                        "\n    https://developer.nvidia.com/cuda-downloads \n")
+endif()
+
+string(REGEX MATCH "V([0-9]+)\\.([0-9]+)\\.([0-9]+)" CUDA_VERSION ${NVCC_OUTPUT})
+message(STATUS "Found CUDA ${CUDA_VERSION}")
+set(CUDA_VERSION_MAJOR ${CMAKE_MATCH_1})
+#set(CUDA_VERSION_MINOR ${CMAKE_MATCH_2})
+#set(CUDA_VERSION_PATCH ${CMAKE_MATCH_3})
+
+
+if (${CUDA_VERSION_MAJOR} LESS 8)
+    message(FATAL_ERROR "CUDA ${CUDA_VERSION} but ${CUDA_REQUIRED_VERSION} is required. Please download and install a more recent version of CUDA from:"
+                        "\n    https://developer.nvidia.com/cuda-downloads \n")
+endif()
+
+SET(VCPKG_POLICY_EMPTY_PACKAGE enabled)
\ No newline at end of file
diff --git a/ports/grpc/portfile.cmake b/ports/grpc/portfile.cmake
index ffd71d137..90915976c 100644
--- a/ports/grpc/portfile.cmake
+++ b/ports/grpc/portfile.cmake
@@ -53,6 +53,8 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/gRPC/gRPCTargets-release.cmake ${C
 file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/gRPC/gRPCTargets-debug.cmake ${CURRENT_PACKAGES_DIR}/share/grpc/gRPCTargets-debug.cmake)
 
 file(INSTALL ${CURRENT_BUILDTREES_DIR}/src/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/grpc RENAME copyright)
+file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools)
+file(INSTALL ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Release/grpc_cpp_plugin.exe DESTINATION ${CURRENT_PACKAGES_DIR}/tools)
 
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin)
 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
diff --git a/ports/poco/CONTROL b/ports/poco/CONTROL
index 6f4f7e3b1..ae2758c1f 100644
--- a/ports/poco/CONTROL
+++ b/ports/poco/CONTROL
@@ -1,4 +1,4 @@
 Source: poco
-Version: 1.7.6-2
+Version: 1.7.6-3
 Build-Depends: zlib, pcre, sqlite3, expat
 Description: Modern, powerful open source C++ class libraries for building network and internet-based applications that run on desktop, server, mobile and embedded systems.
\ No newline at end of file
diff --git a/ports/poco/foundation-public-include-pcre.patch b/ports/poco/foundation-public-include-pcre.patch
new file mode 100644
index 000000000..ab4403ad8
--- /dev/null
+++ b/ports/poco/foundation-public-include-pcre.patch
@@ -0,0 +1,12 @@
+diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
+index 76005b1..efc99b6 100644
+--- a/Foundation/CMakeLists.txt
++++ b/Foundation/CMakeLists.txt
+@@ -166,6 +166,7 @@ target_link_libraries( "${LIBNAME}" ${SYSLIBS})
+ target_include_directories( "${LIBNAME}"
+ 	PUBLIC
+ 		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
++		$<BUILD_INTERFACE:${PCRE_INCLUDE_DIRS}>
+ 		$<INSTALL_INTERFACE:include>
+ 	PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
+ 	)
diff --git a/ports/poco/portfile.cmake b/ports/poco/portfile.cmake
index 413f19c7e..e774c3c17 100644
--- a/ports/poco/portfile.cmake
+++ b/ports/poco/portfile.cmake
@@ -13,6 +13,7 @@ vcpkg_apply_patches(
     PATCHES
 		${CMAKE_CURRENT_LIST_DIR}/config_h.patch
 		${CMAKE_CURRENT_LIST_DIR}/find_pcre.patch
+		${CMAKE_CURRENT_LIST_DIR}/foundation-public-include-pcre.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL static)
diff --git a/ports/websocketpp/CONTROL b/ports/websocketpp/CONTROL
index c11e64d3e..f812dc565 100644
--- a/ports/websocketpp/CONTROL
+++ b/ports/websocketpp/CONTROL
@@ -1,3 +1,4 @@
 Source: websocketpp
 Version: 0.7.0
+Build-Depends: zlib, openssl, boost
 Description: Library that implements RFC6455 The WebSocket Protocol
\ No newline at end of file
diff --git a/ports/wt/CONTROL b/ports/wt/CONTROL
index 1a89dd378..d7ac2c535 100644
--- a/ports/wt/CONTROL
+++ b/ports/wt/CONTROL
@@ -1,4 +1,4 @@
 Source: wt
-Version: 3.3.6-2
+Version: 3.3.6-3
 Description: Wt is a C++ library for developing web applications
 Build-Depends: boost, openssl
diff --git a/ports/wt/portfile.cmake b/ports/wt/portfile.cmake
index f762eface..7e2bdb47c 100644
--- a/ports/wt/portfile.cmake
+++ b/ports/wt/portfile.cmake
@@ -7,10 +7,15 @@ vcpkg_download_distfile(ARCHIVE_FILE
     SHA512 d6135713d300bcd3956a4fd673af73be0561eb5d6aa91c47255b966950ddb411217e6a826c1d11c0d941dbb6d006c9926231d7334b21de6256cca331066e18a6
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
-
+vcpkg_download_distfile(PATCH_FILE
+    URLS "https://github.com/emweb/wt/commit/b944cdc0961f683cd12fc6e60db3d0b328cd46dd.diff"
+    FILENAME "wt-fix-boost-1-63.diff"
+    SHA512 0766837ed8852da675b02b45bfbe7a6705ab20f67aa20849df4cc4b93b00dec0b73acea3568bca1046e203119445044c5ea06e33bac5d5d991f6a56b8fe282e1
+)
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
     PATCHES ${CMAKE_CURRENT_LIST_DIR}/add-disable-boost-autolink-option.patch
+            ${PATCH_FILE}
 )
 
 vcpkg_configure_cmake(