Commit Graph

88 Commits

Author SHA1 Message Date
Carles Fernandez 3b8a6a8346 Updating Armadillo version to 4.400.0 2014-08-19 20:41:15 +02:00
Carles Fernandez 8ed642e58c Updating Armadillo version to 4.320.2 2014-08-17 19:55:11 +02:00
Carles Fernandez df6b282582 Providing more information if ENABLE_GPERFTOOLS is set to ON and the
library is (or it is not) found in the system.
2014-08-11 13:39:12 +02:00
Carles Fernandez 2445620e76 Changing build type to RelWithDebInfo if ENABLE_GPERFTOOLS option is ON 2014-08-10 20:00:10 +02:00
Carles Fernandez 3257d8cba1 Improving handling of optional processing blocks and linking libraries.
New options ENABLE_GN3S, ENABLE_RTLSDR, ENABLE_OPENCL, ENABLE_ARRAY and
ENABLE_GPERFTOOLS, all set by default to OFF. Users can enable that
features by 'cmake -DENABLE_XXX=ON ../ '. OpenCL is now not used by
default since it was giving problems in some platforms. Old variables
(RTSDR_DRIVER, GN3S_DRIVER, RAW_ARRAY_DRIVER and DISABLE_OPENCL) are
still honored and can be used in the same way, but the new ENABLE_XXX
are recommended for the sake of more uniform naming. Main CMakeFile.txt
has been rearranged, putting options first, then searching for the
required libraries, and then the optional ones. If Gperftools is enabled
and found, binaries are linked to the tcmalloc and profiler libraries,
and using the adequate flags. Fixed building in Mac OSX if Armadillo and
OpenBLAS were not installed in the system.
2014-08-07 21:04:01 +02:00
Carles Fernandez 2fcb2e14e8 Fixing link to OpenBLAS 2014-08-01 13:49:55 +02:00
Carles Fernandez 3e99566dd3 Use OpenBLAS instead of BLAS if available. OpenBLAS is an optimized BLAS
library.
2014-08-01 12:27:11 +02:00
Carles Fernandez afc7d1c8e3 Updating Armadillo version to 4.320.0 and simplifying the static
building process. No patch is applied to the original CMakeLists.txt
anymore, so next version upgrades should be easier.
2014-08-01 10:52:20 +02:00
Carles Fernandez 8dfcc5114c Bumping version number 2014-06-30 20:46:36 +02:00
Carles Fernandez 7d9458cfdd Update Armadillo version to 4.300.9 2014-06-26 01:04:41 +02:00
Carles Fernandez b2f3ecd72e Fixes many warnings in CMake 3.0. When glog or armadillo are present in
the system, glog_RELEASE/armadillo_RELEASE are not defined and several
add_dependencies were adding non-existing targets
(glog-${glog_RELEASE}). This commit creates imported logical targets
when those libraries are already present, so the warnings disappear.
2014-06-20 03:34:19 +02:00
Carles Fernandez fabf623c43 Require at least Boost 1.45, so boost:filesystem::temp_directory_path()
can be used. It is useful on Mac OS X, where the log folder is not at
/tmp. Boost 1.45 was released on Nov 9th, 2010, so it is unlikely that
any user is using something older.
2014-06-10 00:14:18 +02:00
Carles Fernandez c85efa7473 Cosmetic changes 2014-06-07 10:23:32 +02:00
Carles Fernandez b2e85053b4 do not link to blas so armadillo can use the faster openblas if found in
the system
2014-06-07 00:12:50 +02:00
Carles Fernandez 6052bdc0c8 Updating Armadillo version to 4.300.8 2014-06-01 11:02:02 +02:00
Carles Fernandez c8ee78bea3 Recommend libopenblas-dev package to Ubuntu/Debian users 2014-05-31 12:31:04 +02:00
Carles Fernandez 2a591bf79c Automatic building of Armadillo 3.x if gcc 4.6 was used is no longer
needed, so always download the latest version. Added a flag to compile
it with the same compiler than gnss-sdr is being built.
2014-05-31 11:18:24 +02:00
Carles Fernandez 8f334df645 Added FATAL_ERROR if gcc version is not at least 4.7, providing a
pointer on how to upgrade to Ubuntu 12.04 users
2014-05-30 19:07:01 +02:00
Carles Fernandez 36a587762b Fixing detection of GTEST_DIR variable when defined with -DGTEST_DIR=... 2014-05-28 22:02:11 +02:00
Carles Fernandez 31b4738d39 Fixing detection of GTEST_DIR environment variable 2014-05-28 20:24:29 +02:00
Carles Fernandez 571248f3f2 Update Armadillo version to 4.300.6 2014-05-25 13:23:54 +02:00
Carles Fernandez ca4b8e232c Fixes automatic building of GFlags and Glog when clang is used (e.g.
MacOS X)
2014-05-18 12:53:16 +02:00
Carles Fernandez 1518e5ac5d Update Armadillo version and other minor cleaning 2014-05-16 19:16:36 +02:00
Carles Fernandez 9a4a3443b2 updating armadillo patch 2014-05-11 22:37:43 +02:00
Carles Fernandez 190afb2c32 Updating armadillo version to 4.300.2 2014-05-11 22:19:53 +02:00
Carles Fernandez 53b227a0c1 Finding Gflags and Glog if they are installed with Macports. Fixing
problems finding Gperftools libraries
2014-05-11 14:50:57 +02:00
Carles Fernandez 054608896a Added warning if GCC is older than 4.7. Fixing detection of GTEST_DIR
environment variable
2014-05-07 22:08:41 +02:00
Carles Fernandez 9a33f3fb70 Adding git branch and commit to the version name for all non-master
branches
2014-04-10 22:05:04 +02:00
Javier Arribas 743af3398d Fixed GTEST_DIR env variable detector under MACOSX. Fixed small compatibility issue in armadilo norm for armadillo version < 4.100
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@503 64b25241-fba3-4117-9849-534c7e92360d
2014-04-07 16:20:09 +00:00
Carles Fernandez 39f8754217 Cleaning the terminal output and dumping most of the information in the log file. Better use of the glog library, logging can be seen also in Release, in real time by doing './gnss-sdr --logtostderr=1'. Update to latest version of Armadillo.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@486 64b25241-fba3-4117-9849-534c7e92360d
2014-03-16 19:58:29 +00:00
Carles Fernandez 26d2bc70b3 Adds the option to avoid the use of OpenCL by doing 'cmake ../ -DDISABLE_OPENCL=1'
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@485 64b25241-fba3-4117-9849-534c7e92360d
2014-03-15 01:21:17 +00:00
Javier Arribas 28d6b9a122 GNSS-SDR Array blocks update
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@482 64b25241-fba3-4117-9849-534c7e92360d
2014-02-18 19:40:44 +00:00
Carles Fernandez ad01074657 Fixes compilation of Armadillo in Ubuntu 12.04 by switching back to version 3.9 if gcc <=4.6 is detected.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@478 64b25241-fba3-4117-9849-534c7e92360d
2014-02-02 11:14:29 +00:00
Carles Fernandez 57b7f430a7 Added paths to find gfortran in Debian 7 (thanks to Marc Hölscher)
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@474 64b25241-fba3-4117-9849-534c7e92360d
2014-01-08 16:04:41 +00:00
Carles Fernandez 0afa894ff2 Fixed a bug that prevented compilation when cmake was run twice and Armadillo was not already installed
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@473 64b25241-fba3-4117-9849-534c7e92360d
2014-01-08 10:20:11 +00:00
Carles Fernandez 6f51292e17 Automatic building of Armadillo upgraded to version 4.000.0. Updated links to new BeiDou ICD and Performance documents.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@472 64b25241-fba3-4117-9849-534c7e92360d
2014-01-07 12:55:09 +00:00
Carles Fernandez a4814362c5 Adding stuff for building gnss-sdr on openSUSE 13.1
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@471 64b25241-fba3-4117-9849-534c7e92360d
2013-12-30 02:11:32 +00:00
Carles Fernandez eca42b2655 Improving cmake output if doxygen is not detected
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@470 64b25241-fba3-4117-9849-534c7e92360d
2013-12-21 11:39:16 +00:00
Carles Fernandez b4ed22ee76 Upgrading Armadillo version. Removed some warnings when building in Release with clang.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@469 64b25241-fba3-4117-9849-534c7e92360d
2013-12-21 11:11:05 +00:00
Carles Fernandez 0d16ac4a69 Fixes bug that made configuration crash when glog and gflags were not installed and the script was run twice before doing 'make'
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@468 64b25241-fba3-4117-9849-534c7e92360d
2013-12-20 03:02:47 +00:00
Carles Fernandez 71fcd899a4 Change in cmake scripts that allows 'make' to spawn the provided amount of threads when armadillo, gflags or glog are downloaded and built 'on-the-fly'. Ideally each thread is executed on its own core/CPU, so a multi-core/CPU environment is used to its fullest. This fix allows compilation with e.g. 'make -j4"
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@465 64b25241-fba3-4117-9849-534c7e92360d
2013-12-20 00:11:14 +00:00
Carles Fernandez a0cda5ae4d Fixing detection of Fedora, LinuxMint and Debian distributions
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@463 64b25241-fba3-4117-9849-534c7e92360d
2013-12-14 14:36:33 +00:00
Carles Fernandez 004495507d Fixing detection of GNU Radio when installed in non-usual locations (e.g. /home/user/target). Now the user can tell cmake where GNU Radio is by 'cmake ../ -DGNURADIO_INSTALL_PREFIX=/home/user/target'
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@462 64b25241-fba3-4117-9849-534c7e92360d
2013-12-14 10:23:33 +00:00
Carles Fernandez 173cc13f76 Improving detection of GNU Radio
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@460 64b25241-fba3-4117-9849-534c7e92360d
2013-12-11 23:27:46 +00:00
Carles Fernandez c89ca38ba4 Fixing detection of gfrontran in Ubuntu 12.04
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@459 64b25241-fba3-4117-9849-534c7e92360d
2013-12-10 22:46:30 +00:00
Carles Fernandez e06af9f5f1 Improving detection of the operating system version and prettier output when configuring. Improving hints when dependencies are missing according to the OS (yum or apt-get)
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@458 64b25241-fba3-4117-9849-534c7e92360d
2013-12-10 20:17:57 +00:00
Carles Fernandez ba8ebf0522 Fix detecting gfortran
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@457 64b25241-fba3-4117-9849-534c7e92360d
2013-12-05 19:05:54 +00:00
Carles Fernandez d18b12624f Improving detection of blas, lapack and gfortran, as well as giving hints about how to install them if missing.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@456 64b25241-fba3-4117-9849-534c7e92360d
2013-12-05 18:36:45 +00:00
Carles Fernandez e8601cf111 Improving detection of required libraries and giving hints on how to install them: BLAS, LAPACK, gfortran and OpenSSL.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@454 64b25241-fba3-4117-9849-534c7e92360d
2013-11-27 21:11:21 +00:00
Carles Fernandez 669910f6af Improving the way cmake detects GNU Radio. Switching from FindGnuradioXXX() to ConfigGnuradio.cmake. Fixed a typo in README. Tested in Mac OS X 10.9 and Ubuntu 13.10 64 bits, should work on other versions as well.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@442 64b25241-fba3-4117-9849-534c7e92360d
2013-11-13 21:07:33 +00:00