Merge branch 'master' of https://github.com/Microsoft/vcpkg into patch-vs2013

# Conflicts:
#	scripts/cmake/vcpkg_configure_cmake.cmake
#	toolsrc/src/vcpkg/vcpkgpaths.cpp

3 files changed, 52 insertions, 6 deletions

diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index ca7923ffc..3355159f4 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,3 +1,4 @@
 Source: blaze
-Version: 3.2
+Version: 3.2-2
+Build-Depends: boost, clapack
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/blaze/no-absolute-paths-in-install.patch b/ports/blaze/no-absolute-paths-in-install.patch
new file mode 100644
index 000000000..a601a37e7
--- /dev/null
+++ b/ports/blaze/no-absolute-paths-in-install.patch
@@ -0,0 +1,33 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0d102ab..5d918b8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -36,7 +36,7 @@ cmake_minimum_required(VERSION 3.5)
+ add_library(blaze INTERFACE)
+ target_include_directories(blaze INTERFACE
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}>
+-   $<INSTALL_INTERFACE:install>
++   $<INSTALL_INTERFACE:include>
+    )
+ 
+ target_compile_options(blaze INTERFACE
+@@ -48,8 +48,8 @@ target_compile_options(blaze INTERFACE
+ #==================================================================================================
+ 
+ find_package(LAPACK REQUIRED)
+-target_link_libraries(blaze INTERFACE ${LAPACK_LIBRARIES})
+-target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
++target_link_libraries(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LIBRARIES}>)
++target_compile_options(blaze INTERFACE $<BUILD_INTERFACE:${LAPACK_LINKER_FLAGS}>)
+ 
+ 
+ #==================================================================================================
+@@ -57,7 +57,7 @@ target_compile_options(blaze INTERFACE ${LAPACK_LINKER_FLAGS})
+ #==================================================================================================
+ 
+ find_package(Boost 1.54.0 REQUIRED)
+-target_include_directories(blaze INTERFACE ${Boost_INCLUDE_DIRS})
++target_include_directories(blaze INTERFACE $<BUILD_INTERFACE:${Boost_INCLUDE_DIRS}>)
+ 
+ 
+ #==================================================================================================
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake
index a8fc5ab1e..7bbb58afc 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -1,4 +1,3 @@
-#header-only library
 include(vcpkg_common_functions)
 
 vcpkg_from_bitbucket(
@@ -9,10 +8,23 @@ vcpkg_from_bitbucket(
     HEAD_REF master
 )
 
-# Copy the blaze header files
-file(COPY "${SOURCE_PATH}/blaze"
-     DESTINATION "${CURRENT_PACKAGES_DIR}/include"
-     FILES_MATCHING PATTERN "*.h")
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
+)
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    PREFER_NINJA
+    OPTIONS
+        -DBLAZE_SMP_THREADS=C++11
+)
+
+vcpkg_install_cmake()
+
+vcpkg_fixup_cmake_targets(CONFIG_PATH share/blaze/cmake)
+
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
 
 # Handle copyright
 file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/blaze)