mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-10-23 19:47:40 +00:00
Fixes compilation issues on Mac OS X. Now it builds successfully against gnuradio installed by Macports and using gcc 4.8. Upgrade version of Gtest. Some fixes and updates in documentation and code cleaning.
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@423 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
@@ -16,17 +16,6 @@
|
||||
# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
|
||||
#
|
||||
|
||||
#if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
#set(GNSS_SPLIBS_SOURCES
|
||||
# galileo_e1_signal_processing.cc
|
||||
# gnss_sdr_valve.cc
|
||||
# gnss_signal_processing.cc
|
||||
# gps_sdr_signal_processing.cc
|
||||
# pass_through.cc
|
||||
#)
|
||||
#else(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
#endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
||||
|
||||
if(OPENCL_FOUND)
|
||||
set(GNSS_SPLIBS_SOURCES
|
||||
galileo_e1_signal_processing.cc
|
||||
@@ -62,7 +51,11 @@ include_directories(
|
||||
|
||||
if(OPENCL_FOUND)
|
||||
include_directories( ${OPENCL_INCLUDE_DIRS} )
|
||||
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES})
|
||||
if(OS_IS_MACOSX)
|
||||
set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
|
||||
else(OS_IS_MACOSX)
|
||||
set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES})
|
||||
endif(OS_IS_MACOSX)
|
||||
endif(OPENCL_FOUND)
|
||||
|
||||
add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES})
|
||||
|
12305
src/algorithms/libs/cl.hpp
Normal file
12305
src/algorithms/libs/cl.hpp
Normal file
File diff suppressed because it is too large
Load Diff
@@ -55,8 +55,8 @@ extern "C" {
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#ifdef APPLE
|
||||
#include <OpenCL/cl.h>
|
||||
#ifdef __APPLE__
|
||||
#include <OpenCL/opencl.h>
|
||||
#else
|
||||
#include <CL/cl.h>
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user