mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-07-01 17:33:15 +00:00
Code Issues Releases Wiki Activity

Fixing compilation and linking of googletest

Browse Source 
git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@139 64b25241-fba3-4117-9849-534c7e92360d
This commit is contained in:
Carles Fernandez 2012-01-23 14:47:06 +00:00
parent 3bff16b5d1
commit 059b05fcf2
3 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
jamroot.jam
View File

@ -1,5 +1,15 @@
import os ;
local GTEST_DIR = [ os.environ GTEST_DIR ] ;
project gtest : source-location $(GTEST_DIR)/src : build-dir ../../build ;
lib gtest
: gtest-all.cc # sources
: <include>$(GTEST_DIR) # requirements
<include>$(GTEST_DIR)/include
<link>static ;
lib gtest ;
lib glog ; lib glog ;
lib gflags ; lib gflags ;
lib gnuradio-core ; lib gnuradio-core ;
@ -42,6 +52,7 @@ project : requirements
<include>$GNURADIO_ROOT/gnuradio-core/src/lib/general <include>$GNURADIO_ROOT/gnuradio-core/src/lib/general
<include>$GNURADIO_ROOT/gnuradio-core/src/lib/gengen <include>$GNURADIO_ROOT/gnuradio-core/src/lib/gengen
<include>$GNURADIO_ROOT/volk/lib <include>$GNURADIO_ROOT/volk/lib
<include>$(GTEST_DIR)/include
<threading>multi <threading>multi
<toolset>darwin:<include>/opt/local/include ; <toolset>darwin:<include>/opt/local/include ;

2
src/tests/gnuradio_block/gnss_sdr_valve_test.cc
View File

@ -33,7 +33,7 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <gr_top_block.h> #include <gr_top_block.h>
#include <gr_sig_source_f.h> #include <gnuradio/gr_sig_source_f.h>
#include <gr_null_sink.h> #include <gr_null_sink.h>
#include <gr_msg_queue.h> #include <gr_msg_queue.h>
#include "gnss_sdr_valve.h" #include "gnss_sdr_valve.h"

7
src/tests/jamfile.jam
View File

@ -1,8 +1,5 @@
lib gtest ;
obj test_main : test_main.cc ;
project : build-dir ../../build ; project : build-dir ../../build ;
exe run_tests : test_main.cc exe run_tests : test_main.cc
../algorithms/acquisition/adapters//gps_l1_ca_gps_sdr_acquisition ../algorithms/acquisition/adapters//gps_l1_ca_gps_sdr_acquisition
../algorithms/acquisition/adapters//gps_l1_ca_pcps_acquisition ../algorithms/acquisition/adapters//gps_l1_ca_pcps_acquisition
@ -60,6 +57,6 @@ exe run_tests : test_main.cc
../..//gflags ../..//gflags
../..//glog ../..//glog
../..//gnuradio-core ../..//gnuradio-core
../..//gtest ; ../..//gtest : <include>$(GTEST_DIR)/include ;
install ../../install : run_tests ; install ../../install : run_tests ;