Commit Graph
24 Commits
Author SHA1 Message Date
Ryan Curtin c2aa754e69 Merge pull request #2467 from shrit/cmake_aramdillo
Cmake aramdillo
2020-06-25 22:24:47 -04:00
Omar Shrit fc5203ab6a I do not think anyone today is using Armadillo v0.9
Remove support of Armadillo versions used when I was
seven years old.

Signed-off-by: Omar Shrit <shrit@lri.fr>
2020-06-20 17:04:07 +02:00
Ryan BirminghamandMarcus Edel 7ef233d298 Period at end of sentence.
Co-authored-by: Marcus Edel <marcus.edel@fu-berlin.de>
2020-06-18 14:08:34 -04:00
Ryan Birmingham fc9e30cbd9 describe msvc case 2020-06-18 11:09:03 -04:00
Ryan Birmingham 075cb93b4c shuffle conditions for potential windows portability 2020-06-18 10:45:05 -04:00
Ryan Birmingham 609fa6e020 pretend non-wrapper msvc 2020-06-17 22:50:56 -04:00
Ryan Birmingham 97fd462a98 Simplify CMake for Armadillo and its Dependencies (#2247)
* start simplify of arma deps

* no manual openblas links

* slight change to openblas get and order

* restore tools directory

* Rename

* wrong opts renamed

* better handle no wrapper case

* library -> libraries

* move dep links to findArmadillo

* minor cleanup of findArma

* giving up on cleanup of config get

* simplify header read

* special HDF5 case

* more closely follo hdf5 case

* remove standard findblas/lapack

* cleanup doc and quiet mode
2020-03-11 15:18:33 -04:00
Alexander Leinoff 2330419b86 Removes CMake block termination arguments
Previously CMake block termination commands were required to have arguments
matching the command starting the block. This is no longer necessary and not
the preferred style. This type of change has been implemented in other open
source projects such as: ITK, vxl, and BRAINSTools. It is the preferred style
for KDE. Consistent style practices help improve readability and
maintainability of code.

This was implemented with the shell script:
NOTE: MUST USE GNU compliant version of sed
in else endif endforeach endfunction endmacro endwhile; do
        echo 's/\b'"$c"'\(\s*\)(.\+)/'"$c"'\1()/'
    done >convert.sed \
    && git ls-files -z -- bootstrap '*.cmake' '*.cmake.in' '*CMakeLists.txt' \
       | xargs -0 gsed -i -f convert.sed \
    && rm convert.sed

This is a reimplementation of ITK commit
e52dbe7fa476f6283c9b9d1507fca052355113a4

Fixes #585
2016-03-21 17:23:25 -05:00
Ryan Curtin a7a05d8fe4 Fix typo: we should be checking HAVE_LAPACK not LAPACK_FOUND.
LAPACK_FOUND is only set if MKL/ACML/etc. isn't found, but HAVE_LAPACK is set in
both situations.
2016-01-27 07:34:58 -08:00
Ryan Curtin cec4ac4275 Issue an error if config.hpp is not found. 2015-12-09 11:41:10 -05:00
Ryan Curtin 7250d23298 Better handling of Armadillo configuration files, since ARMA_USE_HDF5 may appear
twice incorrectly (reported by Giampaolo).
2014-12-10 21:44:19 +00:00
Ryan Curtin 230bd4fa69 Better handling of the weird case when includes are needed but the library isn't. 2014-11-14 16:44:40 +00:00
Ryan Curtin e45ce79e2a Smarter handling of HDF5 dependency search, especially for Debian systems where
things are Weird(TM).
2014-11-11 17:15:11 +00:00
Ryan Curtin d0e6102d7b Use FATAL_ERROR instead of FATAL. Also find ARPACK quietly. 2014-08-22 21:29:29 +00:00
Ryan Curtin cdfb98c5cd Be quiet when finding things so as to not duplicate output. 2014-08-22 20:57:50 +00:00
Ryan Curtin d08dc799a3 A first draft of a smarter FindArmadillo script, which takes into account
whether or not ARMA_USE_WRAPPER is being used.
2014-08-22 20:55:17 +00:00
Ryan Curtin bb3697782b Clean up output a little bit. 2013-03-29 23:10:23 +00:00
Ryan Curtin f4d61110e4 Use custom FindArmadillo script, which will find (and link against) HDF5 if
necessary.
2013-03-29 22:59:38 +00:00
Ryan Curtin 0ab819ff30 FindArmadillo.cmake ships with CMake from version 2.8.5-rc1 onwards. So require
that.
2012-08-08 16:51:56 +00:00
Ryan Curtin 6faadae371 Fix corner case where found version is equal to the required version. 2012-07-14 04:48:52 +00:00
Ryan Curtin e9a930c78c Work for older CMake versions (2.8.2) and finding older Armadillo versions. 2012-05-24 17:26:37 +00:00
Ryan Curtin cdfd49b770 Turns out not every version of CMake ships with this... 2012-03-12 20:08:47 +00:00
Ryan Curtin 5c588f38e9 We shouldn't provide these ourselves; CMake 2.8 does that already. 2012-03-12 19:16:30 +00:00
Ryan Curtin 2f369e3b78 Move mlpack/trunk/ to root of repository (fake commit during svn to git
transition).
2014-12-17 12:32:39 -05:00