mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-13 19:50:34 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into elcapitan

Browse Source
This commit is contained in:
Carles Fernandez 2015-09-07 17:19:52 -07:00
commit b81e2a3434
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -62,7 +62,7 @@ endif(ENABLE_PACKAGING)
############################### ###############################
# GNSS-SDR version information # GNSS-SDR version information
############################### ###############################
set(THIS_IS_A_RELEASE ON) # only related to version name, no further implications. set(THIS_IS_A_RELEASE OFF) # only related to version name, no further implications.
if(NOT ${THIS_IS_A_RELEASE}) if(NOT ${THIS_IS_A_RELEASE})
# Get the current working branch # Get the current working branch
execute_process( execute_process(
@ -425,7 +425,14 @@ if(OS_IS_MACOSX)
endif(CMAKE_GENERATOR STREQUAL Xcode) endif(CMAKE_GENERATOR STREQUAL Xcode)
endif(OS_IS_MACOSX) endif(OS_IS_MACOSX)
if(NOT VOLK_GNSSSDR_FOUND) if(NOT VOLK_GNSSSDR_FOUND)
set(VOLK_GNSSSDR_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install -DENABLE_STATIC_LIBS=ON ${STRIP_VOLK_GNSSSDR_PROFILE} ${USE_THIS_PYTHON}) set(VOLK_GNSSSDR_CMAKE_ARGS -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
-DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
-DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
-DENABLE_STATIC_LIBS=ON
-DCMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
${STRIP_VOLK_GNSSSDR_PROFILE}
${USE_THIS_PYTHON} )
if(CMAKE_TOOLCHAIN_FILE) if(CMAKE_TOOLCHAIN_FILE)
set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE}) set(VOLK_GNSSSDR_CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE})
endif(CMAKE_TOOLCHAIN_FILE) endif(CMAKE_TOOLCHAIN_FILE)

2
README.md
View File

@ -1,7 +1,5 @@
![](./docs/doxygen/images/gnss-sdr_logo.png) ![](./docs/doxygen/images/gnss-sdr_logo.png)
[![DOI 10.5281/zenodo.30104](https://zenodo.org/badge/doi/10.5281/zenodo.30104.svg)](http://dx.doi.org/10.5281/zenodo.30104)
**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.

4
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt
View File

@ -79,6 +79,10 @@ if(HAVE_POSIX_MEMALIGN)
add_definitions(-DHAVE_POSIX_MEMALIGN) add_definitions(-DHAVE_POSIX_MEMALIGN)
endif(HAVE_POSIX_MEMALIGN) endif(HAVE_POSIX_MEMALIGN)
if(NOT DEFINED _XOPEN_SOURCE)
add_definitions(-D_XOPEN_SOURCE=700)
endif(NOT DEFINED _XOPEN_SOURCE)
######################################################################## ########################################################################
# detect x86 flavor of CPU # detect x86 flavor of CPU
######################################################################## ########################################################################