mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-25 12:37:40 +00:00
Code Issues Releases Wiki Activity

Remove gfortran from the list of required dependencies, but still used

Browse Source 
if present
This commit is contained in:
Carles Fernandez
2015-03-22 11:33:28 +01:00
parent 7dbc3dfb7b
commit a4343c3b6b
2 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CMakeLists.txt
View File

@@ -668,7 +668,7 @@ if(OS_IS_LINUX)
message(FATAL_ERROR "BLAS is required to build gnss-sdr") message(FATAL_ERROR "BLAS is required to build gnss-sdr")
endif(NOT BLAS) endif(NOT BLAS)
############################################# #############################################
# Check that GFORTRAN is found in the system # Check if GFORTRAN is found in the system
############################################# #############################################
find_library(GFORTRAN NAMES gfortran find_library(GFORTRAN NAMES gfortran
PATHS /usr/lib PATHS /usr/lib
@@ -719,24 +719,23 @@ if(OS_IS_LINUX)
/usr/lib/gcc/arm-linux-gnueabi/4.9 /usr/lib/gcc/arm-linux-gnueabi/4.9
) )
if(NOT GFORTRAN) if(NOT GFORTRAN)
message(" The gfortran library has not been found.") message(STATUS "The gfortran library has not been found.")
message(" You can try to install it by typing:") message(STATUS " You can try to install it by typing:")
if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") if(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
message(" sudo yum install gcc-fortran") message(STATUS" sudo yum install gcc-fortran")
elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE") elseif(${LINUX_DISTRIBUTION} MATCHES "openSUSE")
message(" sudo zypper install gcc-fortran") message(STATUS" sudo zypper install gcc-fortran")
else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") else(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
message(" sudo apt-get install gfortran") message(STATUS" sudo apt-get install gfortran")
endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat") endif(${LINUX_DISTRIBUTION} MATCHES "Fedora" OR ${LINUX_DISTRIBUTION} MATCHES "Red Hat")
#message(FATAL_ERROR "gfortran is required to build gnss-sdr")
endif(NOT GFORTRAN) endif(NOT GFORTRAN)
endif(OS_IS_LINUX) endif(OS_IS_LINUX)
find_package(Armadillo) find_package(Armadillo)
if(NOT ARMADILLO_FOUND) if(NOT ARMADILLO_FOUND)
message (STATUS " Armadillo has not been found.") message(STATUS " Armadillo has not been found.")
message (STATUS " Armadillo will be downloaded and built automatically ") message(STATUS " Armadillo will be downloaded and built automatically ")
message (STATUS " when doing 'make'. ") message(STATUS " when doing 'make'. ")
set(armadillo_RELEASE 4.650.4) set(armadillo_RELEASE 4.650.4)
set(armadillo_MD5 "e575dc01cf60e290a467c7c6d3171ef3") set(armadillo_MD5 "e575dc01cf60e290a467c7c6d3171ef3")
@@ -765,6 +764,9 @@ if(NOT ARMADILLO_FOUND)
if(OPENBLAS_FOUND) if(OPENBLAS_FOUND)
set(BLAS ${OPENBLAS}) set(BLAS ${OPENBLAS})
endif(OPENBLAS_FOUND) endif(OPENBLAS_FOUND)
if(NOT GFORTRAN)
set(GFORTRAN "")
endif(NOT GFORTRAN)
set(ARMADILLO_LIBRARIES ${BLAS} ${LAPACK} ${GFORTRAN} ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo.a) set(ARMADILLO_LIBRARIES ${BLAS} ${LAPACK} ${GFORTRAN} ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}armadillo.a)
set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE) set(LOCAL_ARMADILLO true CACHE STRING "Armadillo downloaded and built automatically" FORCE)
# Save a copy at the thirdparty folder # Save a copy at the thirdparty folder

2
README.md
View File

@@ -33,7 +33,7 @@ Before building GNSS-SDR, you need to install all the required dependencies. If
$ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time-dev \ $ sudo apt-get install build-essential cmake git libboost-dev libboost-date-time-dev \
libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev \ libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev \
libboost-serialization-dev libboost-program-options-dev libboost-test-dev \ libboost-serialization-dev libboost-program-options-dev libboost-test-dev \
liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev gfortran \ liblog4cpp5-dev libuhd-dev gnuradio-dev gr-osmosdr libblas-dev liblapack-dev \
libarmadillo-dev libgflags-dev libgoogle-glog-dev libssl-dev libgtest-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libssl-dev libgtest-dev
~~~~~~ ~~~~~~