diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-11-20 09:16:20 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-11-20 10:27:25 (GMT) |
| commit | c864d524687d0fef08e43eeba855bfb4c631a632 (patch) | |
| tree | dbcac89aa793e31b7c46faaf80afa31c4f3ef867 /src/armadillo-1-fixes.patch | |
| parent | 2194eb9855fc300cb530c1d9e9333170584ff5ea (diff) | |
| download | mxe-c864d524687d0fef08e43eeba855bfb4c631a632.zip mxe-c864d524687d0fef08e43eeba855bfb4c631a632.tar.gz mxe-c864d524687d0fef08e43eeba855bfb4c631a632.tar.bz2 | |
armadillo: update 7.960.1 --> 8.200.2 and enable hdf5 + openblas
Diffstat (limited to 'src/armadillo-1-fixes.patch')
| -rw-r--r-- | src/armadillo-1-fixes.patch | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/src/armadillo-1-fixes.patch b/src/armadillo-1-fixes.patch new file mode 100644 index 0000000..299ae53 --- /dev/null +++ b/src/armadillo-1-fixes.patch @@ -0,0 +1,26 @@ +This file is part of MXE. See LICENSE.md for licensing information. + +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Timothy Gu <timothygu99@gmail.com> +Date: Sun, 19 Oct 2014 12:09:55 -0400 +Subject: [PATCH 1/1] Don't export package + +Signed-off-by: Timothy Gu <timothygu99@gmail.com> + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 1111111..2222222 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -444,7 +444,9 @@ install(TARGETS armadillo EXPORT ArmadilloLibraryDepends + + # Export the package for use from the build-tree + # (this registers the build-tree with a global CMake-registry) +-export(PACKAGE armadillo) ++if(CMAKE_VERSION VERSION_GREATER "2.7" AND NOT (MINGW AND CMAKE_TOOLCHAIN_FILE)) ++ export(PACKAGE armadillo) ++endif() + + ## LOCAL FILES + # Create ArmadilloConfig.cmake file for the use from the build tree |