diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/blaze/avoid-src-dir-generation.patch | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/blaze/avoid-src-dir-generation.patch')
| -rw-r--r-- | ports/blaze/avoid-src-dir-generation.patch | 113 |
1 files changed, 113 insertions, 0 deletions
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)
+
|