mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-13 19:50:34 +00:00
Merge git+ssh://github.com/gnss-sdr/gnss-sdr into next
Conflicts: CMakeLists.txt
This commit is contained in:
commit
790a60c074
@ -27,6 +27,8 @@ cmake_minimum_required(VERSION 2.8)
|
|||||||
project(gnss-sdr CXX C)
|
project(gnss-sdr CXX C)
|
||||||
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
|
||||||
file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
file(RELATIVE_PATH RELATIVE_CMAKE_CALL ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
|
||||||
|
include(TestForARM)
|
||||||
|
include(TestForSSE)
|
||||||
|
|
||||||
|
|
||||||
########################################################################
|
########################################################################
|
||||||
@ -545,6 +547,8 @@ if(OS_IS_LINUX)
|
|||||||
/usr/lib/gcc/i686-linux-gnu/4.7
|
/usr/lib/gcc/i686-linux-gnu/4.7
|
||||||
/usr/lib/gcc/x86_64-linux-gnu/4.8
|
/usr/lib/gcc/x86_64-linux-gnu/4.8
|
||||||
/usr/lib/gcc/i686-linux-gnu/4.8
|
/usr/lib/gcc/i686-linux-gnu/4.8
|
||||||
|
/usr/lib/gcc/x86_64-linux-gnu/4.9
|
||||||
|
/usr/lib/gcc/i686-linux-gnu/4.9
|
||||||
/usr/lib/gcc/x86_64-redhat-linux/4.7.2 # Fedora 18
|
/usr/lib/gcc/x86_64-redhat-linux/4.7.2 # Fedora 18
|
||||||
/usr/lib/gcc/i686-redhat-linux/4.7.2
|
/usr/lib/gcc/i686-redhat-linux/4.7.2
|
||||||
/usr/lib/gcc/x86_64-redhat-linux/4.8.1 # Fedora 19
|
/usr/lib/gcc/x86_64-redhat-linux/4.8.1 # Fedora 19
|
||||||
@ -560,6 +564,7 @@ if(OS_IS_LINUX)
|
|||||||
/usr/lib/gcc/i486-linux-gnu/4.6
|
/usr/lib/gcc/i486-linux-gnu/4.6
|
||||||
/usr/lib/gcc/i486-linux-gnu/4.7
|
/usr/lib/gcc/i486-linux-gnu/4.7
|
||||||
/usr/lib/gcc/i486-linux-gnu/4.8
|
/usr/lib/gcc/i486-linux-gnu/4.8
|
||||||
|
/usr/lib/gcc/i486-linux-gnu/4.9
|
||||||
)
|
)
|
||||||
if(NOT GFORTRAN)
|
if(NOT GFORTRAN)
|
||||||
message(" The gfortran library has not been found.")
|
message(" The gfortran library has not been found.")
|
||||||
@ -859,18 +864,34 @@ endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|||||||
|
|
||||||
# Processor-architecture related flags
|
# Processor-architecture related flags
|
||||||
# See http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html#i386-and-x86_002d64-Options
|
# See http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86_002d64-Options.html#i386-and-x86_002d64-Options
|
||||||
# Change to '-mtune=generic' when building for distribution
|
# Change to '-mtune=generic' when building for distribution (except when compiling for arm)
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
if (NOT ARCH_COMPILER_FLAGS)
|
||||||
if(OS_IS_MACOSX)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
||||||
set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -march=corei7 -mfpmath=sse")
|
if(OS_IS_MACOSX)
|
||||||
else(OS_IS_MACOSX)
|
set(ARCH_COMPILER_FLAGS "-march=corei7 -mfpmath=sse")
|
||||||
if(ENABLE_GENERIC_ARCH)
|
else(OS_IS_MACOSX)
|
||||||
set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -mtune=generic")
|
if(ENABLE_GENERIC_ARCH)
|
||||||
else(ENABLE_GENERIC_ARCH)
|
if (IS_ARM)
|
||||||
set(MY_CXX_FLAGS "${MY_CXX_FLAGS} -march=native -mfpmath=sse")
|
set(ARCH_COMPILER_FLAGS "-mtune=generic-arm")
|
||||||
endif(ENABLE_GENERIC_ARCH)
|
else (IS_ARM)
|
||||||
endif(OS_IS_MACOSX)
|
set(ARCH_COMPILER_FLAGS "-mtune=generic")
|
||||||
endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
endif(IS_ARM)
|
||||||
|
else(ENABLE_GENERIC_ARCH)
|
||||||
|
if (IS_ARM) # ARM-specific options (https://gcc.gnu.org/onlinedocs/gcc/ARM-Options.html)
|
||||||
|
if (ARM_VERSION STREQUAL "arm")
|
||||||
|
# Unknown arm version - try our best to detect
|
||||||
|
set(ARCH_COMPILER_FLAGS "-mcpu=native")
|
||||||
|
else (ARM_VERSION STREQUAL "arm")
|
||||||
|
set(ARCH_COMPILER_FLAGS "-march=${ARM_VERSION}")
|
||||||
|
endif (ARM_VERSION STREQUAL "arm")
|
||||||
|
else (IS_ARM)
|
||||||
|
set(ARCH_COMPILER_FLAGS "-march=native -mfpmath=sse")
|
||||||
|
endif (IS_ARM)
|
||||||
|
endif(ENABLE_GENERIC_ARCH)
|
||||||
|
endif(OS_IS_MACOSX)
|
||||||
|
endif(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
||||||
|
endif (NOT ARCH_COMPILER_FLAGS)
|
||||||
|
set(MY_CXX_FLAGS "${MY_CXX_FLAGS} ${ARCH_COMPILER_FLAGS}")
|
||||||
|
|
||||||
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
if(CMAKE_COMPILER_IS_GNUCXX AND NOT WIN32)
|
||||||
#http://gcc.gnu.org/wiki/Visibility
|
#http://gcc.gnu.org/wiki/Visibility
|
||||||
@ -916,5 +937,3 @@ add_custom_target(uninstall
|
|||||||
# Add subdirectories (in order of deps)
|
# Add subdirectories (in order of deps)
|
||||||
########################################################################
|
########################################################################
|
||||||
add_subdirectory(src)
|
add_subdirectory(src)
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,5 +1,7 @@
|
|||||||
![](./docs/doxygen/images/gnss-sdr_logo.png)
|
![](./docs/doxygen/images/gnss-sdr_logo.png)
|
||||||
|
|
||||||
|
[![DOI 10.5281/zenodo.11628](https://zenodo.org/badge/doi/10.5281/zenodo.11628.png)](http://dx.doi.org/10.5281/zenodo.11628)
|
||||||
|
|
||||||
**Welcome to GNSS-SDR!**
|
**Welcome to GNSS-SDR!**
|
||||||
|
|
||||||
Visit [gnss-sdr.org](http://gnss-sdr.org "GNSS-SDR's Homepage") for more information about this open source GNSS software defined receiver.
|
Visit [gnss-sdr.org](http://gnss-sdr.org "GNSS-SDR's Homepage") for more information about this open source GNSS software defined receiver.
|
||||||
|
Loading…
Reference in New Issue
Block a user