diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-06-30 21:05:51 -0700 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-07-02 22:16:47 -0700 |
| commit | b08e78b07d4340a537f8d1470137883775a8902a (patch) | |
| tree | 98e3e558875e42d4c0a4cef8c9e0cbbad720f25e /ports/blaze | |
| parent | 3c16addc8c8e6516a4ee4edcb11c1fc428d38b96 (diff) | |
| download | vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.tar.gz vcpkg-b08e78b07d4340a537f8d1470137883775a8902a.zip | |
[cmark][gl3w][libpopt][libraw][libssh][live555] Fixes, mostly around changing download locations.
Diffstat (limited to 'ports/blaze')
| -rw-r--r-- | ports/blaze/no-generate-to-source-dir.patch | 105 | ||||
| -rw-r--r-- | ports/blaze/portfile.cmake | 4 |
2 files changed, 108 insertions, 1 deletions
diff --git a/ports/blaze/no-generate-to-source-dir.patch b/ports/blaze/no-generate-to-source-dir.patch new file mode 100644 index 000000000..2ef7cc76f --- /dev/null +++ b/ports/blaze/no-generate-to-source-dir.patch @@ -0,0 +1,105 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt
+index fcb79e6..c04a3f0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -151,7 +151,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")
+
+
+ #==================================================================================================
+@@ -204,7 +204,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")
+
+
+ #==================================================================================================
+@@ -215,7 +215,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")
+
+
+ #==================================================================================================
+@@ -226,7 +226,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")
+
+
+ #==================================================================================================
+@@ -242,7 +242,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")
+
+
+ #==================================================================================================
+@@ -288,7 +288,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")
+
+
+ #==================================================================================================
+@@ -304,7 +304,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")
+
+
+ #==================================================================================================
+@@ -334,7 +334,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")
+
+
+ #==================================================================================================
+@@ -352,7 +352,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")
+
+
+ #==================================================================================================
+@@ -360,6 +360,19 @@ configure_file ("${CMAKE_CURRENT_LIST_DIR}/cmake/Inline.h.in"
+ #==================================================================================================
+
+ install(DIRECTORY blaze DESTINATION include)
++install(
++ FILES
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/BLAS.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/CacheSize.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Inline.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Optimizations.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Restrict.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/SMP.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/StorageOrder.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/TransposeFlag.h"
++ "${CMAKE_CURRENT_BINARY_DIR}/blaze/config/Vectorization.h"
++ DESTINATION include/blaze/config
++)
+ install(TARGETS blaze EXPORT blazeTargets)
+
+ configure_file(
diff --git a/ports/blaze/portfile.cmake b/ports/blaze/portfile.cmake index 6de95aeb5..f82179a0c 100644 --- a/ports/blaze/portfile.cmake +++ b/ports/blaze/portfile.cmake @@ -10,7 +10,9 @@ vcpkg_from_bitbucket( vcpkg_apply_patches( SOURCE_PATH ${SOURCE_PATH} - PATCHES "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch" + PATCHES + "${CMAKE_CURRENT_LIST_DIR}/no-absolute-paths-in-install.patch" + "${CMAKE_CURRENT_LIST_DIR}/no-generate-to-source-dir.patch" ) vcpkg_configure_cmake( |