Merge branch 'master' of https://github.com/microsoft/vcpkg into dev/philc/3425

4 files changed, 118 insertions, 41 deletions

diff --git a/ports/blaze/CONTROL b/ports/blaze/CONTROL
index c72f70865..dc80b4c41 100644
--- a/ports/blaze/CONTROL
+++ b/ports/blaze/CONTROL
@@ -1,4 +1,4 @@
 Source: blaze
-Version: 3.3
+Version: 3.4-1
 Build-Depends: clapack, boost-exception
 Description: Blaze is an open-source, high-performance C++ math library for dense and sparse arithmetic.
diff --git a/ports/blaze/avoid-src-dir-generation.patch b/ports/blaze/avoid-src-dir-generation.patch
new file mode 100644
index 000000000..c57d6a429
--- /dev/null
+++ b/ports/blaze/avoid-src-dir-generation.patch
@@ -0,0 +1,113 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt

+index 7ecc993..793ec34 100644

+--- a/CMakeLists.txt

++++ b/CMakeLists.txt

+@@ -63,8 +63,8 @@ endif()

+ #==================================================================================================

+ 

+ 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}>)

+ 

+ 

+ #==================================================================================================

+@@ -72,7 +72,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}>)

+ 

+ 

+ #==================================================================================================

+@@ -163,7 +163,7 @@ endif ()

+ set(BLAZE_CACHE_SIZE ${BLAZE_CACHE_SIZE} CACHE STRING "Cache size of the CPU in bytes." FORCE)

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/CacheSize.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/CacheSize.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h")

+ 

+ 

+ #==================================================================================================

+@@ -216,7 +216,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/BLAS.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/BLAS.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h")

+ 

+ 

+ #==================================================================================================

+@@ -227,7 +227,7 @@ set(BLAZE_TRANSPOSE_FLAG "columnVector" CACHE STRING "Specify the default transp

+ set_property(CACHE BLAZE_TRANSPOSE_FLAG PROPERTY STRINGS "columnVector;rowVector")

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/TransposeFlag.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/TransposeFlag.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h")

+ 

+ 

+ #==================================================================================================

+@@ -238,7 +238,7 @@ set(BLAZE_STORAGE_ORDER "rowMajor" CACHE STRING "Specify the default storage ord

+ set_property(CACHE BLAZE_STORAGE_ORDER PROPERTY STRINGS "rowMajor;columnMajor")

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/StorageOrder.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/StorageOrder.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h")

+ 

+ 

+ #==================================================================================================

+@@ -254,7 +254,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Vectorization.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Vectorization.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h")

+ 

+ 

+ #==================================================================================================

+@@ -300,7 +300,7 @@ elseif (BLAZE_SMP_THREADS STREQUAL "HPX")

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/SMP.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/SMP.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h")

+ 

+ 

+ #==================================================================================================

+@@ -316,7 +316,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Restrict.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Restrict.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h")

+ 

+ 

+ #==================================================================================================

+@@ -346,7 +346,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Optimizations.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Optimizations.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h")

+ 

+ 

+ #==================================================================================================

+@@ -364,7 +364,7 @@ else ()

+ endif ()

+ 

+ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"

+-                "${CMAKE_CURRENT_LIST_DIR}/blaze/config/Inline.h")

++                "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h")

+ 

+ 

+ #==================================================================================================

+@@ -379,6 +379,7 @@ write_basic_package_version_file(

+    COMPATIBILITY SameMajorVersion

+    )

+ 

++install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/blaze DESTINATION include)

+ install(DIRECTORY blaze DESTINATION include)

+ install(TARGETS blaze EXPORT blazeTargets)

+ 

diff --git a/ports/blaze/no-absolute-paths-in-install.patch b/ports/blaze/no-absolute-paths-in-install.patch
deleted file mode 100644
index a601a37e7..000000000
--- a/ports/blaze/no-absolute-paths-in-install.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 6de95aeb5..a44808249 100644
--- a/ports/blaze/portfile.cmake
+++ b/ports/blaze/portfile.cmake
@@ -3,14 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_bitbucket(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO blaze-lib/blaze
-    REF v3.3
-    SHA512 1210db57fca04832ff9382cbb904f22f70eab3acbc355a1d22435bfe042d6acac7f86a908d8654cf49517c2ad825cd8be19f85b20b1ebd46a79d474a424653c8
+    REF bbe39c81b68eb0d8647da703899e1ee4a82cdfd3
+    SHA512 84eb8226672d9d11d194d165e7aaa333a0d49ca090bb94472f19242e5f2ad0c3e08a30cdafe055cff51b210b603533f879800bd6784f3ffdb0d9eeca65d58b25
     HEAD_REF master
-)
-
-vcpkg_apply_patches(
-    SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch"
+    PATCHES
+        avoid-src-dir-generation.patch
 )
 
 vcpkg_configure_cmake(