aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLily <47812810+LilyWangL@users.noreply.github.com>2019-09-24 01:39:54 +0800
committerPhil Christensen <philc@microsoft.com>2019-09-23 10:39:54 -0700
commit000e7c68f32896602eeca145fd638967453594b2 (patch)
tree5dec3dad4ab3fbe848a0a821e9c2e0b8bab2a355
parent498a9b758ea1ea200d97ce9f88fb40643fcda5af (diff)
downloadvcpkg-000e7c68f32896602eeca145fd638967453594b2.tar.gz
vcpkg-000e7c68f32896602eeca145fd638967453594b2.zip
[armadillo] Fix configure_file failed (#8299)
-rw-r--r--ports/armadillo/CONTROL2
-rw-r--r--ports/armadillo/portfile.cmake1
2 files changed, 2 insertions, 1 deletions
diff --git a/ports/armadillo/CONTROL b/ports/armadillo/CONTROL
index ef0c926a5..4a0257753 100644
--- a/ports/armadillo/CONTROL
+++ b/ports/armadillo/CONTROL
@@ -1,4 +1,4 @@
Source: armadillo
-Version: 2019-04-16-4
+Version: 2019-04-16-5
Description: Armadillo is a high quality linear algebra library (matrix maths) for the C++ language, aiming towards a good balance between speed and ease of use
Build-Depends: openblas (!osx), clapack (!osx)
diff --git a/ports/armadillo/portfile.cmake b/ports/armadillo/portfile.cmake
index 4e5798f9b..7a9d73fe4 100644
--- a/ports/armadillo/portfile.cmake
+++ b/ports/armadillo/portfile.cmake
@@ -20,6 +20,7 @@ file(REMOVE ${SOURCE_PATH}/cmake_aux/Modules/ARMA_FindOpenBLAS.cmake)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
+ DISABLE_PARALLEL_CONFIGURE
PREFER_NINJA
OPTIONS
-DDETECT_HDF5=false