some linking fixes

README.md

@@ -425,7 +425,7 @@ Getting started
 ===============
 
 
-1. After building the code, you will find the ```gnss-sdr``` executable file at gnss-sdr/install. You can make it available everywhere else by ```sudo make install```. Run the profilers ```volk_profile``` and ```volk_gnsssdr_profile``` for testing all available VOLK kernerls for each architecture supported by your processor. This only has to be done the first time.
+1. After building the code, you will find the ```gnss-sdr``` executable file at gnss-sdr/install. You can make it available everywhere else by ```sudo make install```. Run the profilers ```volk_profile``` and ```volk_gnsssdr_profile``` for testing all available VOLK kernels for each architecture supported by your processor. This only has to be done once.
 2. In post-processing mode, you have to provide a captured GNSS signal file.
     1. The signal file can be easily recorded using the GNU Radio file sink in ```gr_complex<float>``` mode.
     2. You will need a GPS active antenna, a [USRP](http://www.ettus.com/product) and a suitable USRP daughter board to receive GPS L1 C/A signals. GNSS-SDR require to have at least 2 MHz of bandwidth in 1.57542 GHz. (remember to enable the DC bias with the daughter board jumper).
@@ -445,7 +445,7 @@ We use a [DBSRX2](https://www.ettus.com/product/details/DBSRX2) to do the task,
     3. The configuration file has in-line documentation, you can try to tune the number of channels and several receiver parameters. Store your .conf file in some working directory of your choice.
 4. Run the receiver invoking the configuration by
 ```$ gnss-sdr --config_file=/path/to/my_receiver.conf```
-The program reports the current status in text mode, directly to the terminal window. If all goes well, and GNSS-SDR is able to successfully track an decode at least 4 satellites, you will get PVT fixes. The program will write a .kml file and RINEX (yet experimental) files in the install directory. In addition to the console output, GNSS-SDR also writes log files at /tmp/ (configurable with the commandline flag ```./gnss-sdr --log_dir=/path/to/log```).
+The program reports the current status in text mode, directly to the terminal window. If all goes well, and GNSS-SDR is able to successfully track and decode at least 4 satellites, you will get PVT fixes. The program will write a .kml file and RINEX (yet experimental) files in the install directory. In addition to the console output, GNSS-SDR also writes log files at /tmp/ (configurable with the commandline flag ```./gnss-sdr --log_dir=/path/to/log```).
 
    
 

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt

@@ -36,13 +36,20 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )
 
+
+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   set(Clang_required_link "c++")
+elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+   set(Clang_required_link "")
+endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+
 # MAKE volk_gnsssdr_profile
 add_executable(volk_gnsssdr_profile
     ${CMAKE_CURRENT_SOURCE_DIR}/volk_gnsssdr_profile.cc
     ${CMAKE_SOURCE_DIR}/lib/qa_utils.cc
 )
 
-target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES})
+target_link_libraries(volk_gnsssdr_profile volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link})
 
 install(
     TARGETS volk_gnsssdr_profile
@@ -52,7 +59,7 @@ install(
 
 # MAKE volk_gnsssdr-config-info
 add_executable(volk_gnsssdr-config-info volk_gnsssdr-config-info.cc)
-target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr ${Boost_LIBRARIES})
+target_link_libraries(volk_gnsssdr-config-info volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link})
 
 install(
     TARGETS volk_gnsssdr-config-info

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/lib/CMakeLists.txt

@@ -250,20 +250,17 @@ endif()
 # this makes things work when both -m32 and -m64 pass
 ########################################################################
 if(NOT CROSSCOMPILE_MULTILIB AND CPU_IS_x86)
-    include(CheckTypeSize)
+    if( CMAKE_SIZEOF_VOID_P EQUAL 8 )
-    check_type_size("void*[8]" SIZEOF_CPU BUILTIN_TYPES_ONLY)
-    if (${SIZEOF_CPU} EQUAL 64)
         OVERRULE_ARCH(32 "CPU width is 64 bits")
     endif()
-    if (${SIZEOF_CPU} EQUAL 32)
+    if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
         OVERRULE_ARCH(64 "CPU width is 32 bits")
     endif()
 
     #MSVC 64 bit does not have MMX, overrule it
-    if (${SIZEOF_CPU} EQUAL 64 AND MSVC)
+    if (CMAKE_SIZEOF_VOID_P EQUAL 8 AND MSVC)
         OVERRULE_ARCH(mmx "No MMX for Win64")
     endif()
-
 endif()
 
 ########################################################################
@@ -566,7 +563,6 @@ endif(ENABLE_STATIC_LIBS)
 
 
 if(Boost_FOUND)
-
     set_source_files_properties(
         ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc PROPERTIES
         COMPILE_DEFINITIONS "BOOST_TEST_DYN_LINK;BOOST_TEST_MAIN"
@@ -579,7 +575,12 @@ if(Boost_FOUND)
         ${CMAKE_CURRENT_SOURCE_DIR}/testqa.cc
         ${CMAKE_CURRENT_SOURCE_DIR}/qa_utils.cc
     )
-    target_link_libraries(test_all volk_gnsssdr ${Boost_LIBRARIES})
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+       set(Clang_required_link "c++")
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+       set(Clang_required_link "")
+    endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+    target_link_libraries(test_all volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link})
     add_test(qa_volk_gnsssdr_test_all test_all)
 
 endif(Boost_FOUND)

src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/volk_gnsssdr.pc.in

@@ -1,7 +1,7 @@
-prefix=@prefix_@
+prefix=@prefix@
-exec_prefix=@exec_prefix_@
+exec_prefix=@exec_prefix@
-libdir=@libdir_@
+libdir=@libdir@
-includedir=@includedir_@
+includedir=@includedir@
 LV_CXXFLAGS=@LV_CXXFLAGS@
 
 

src/main/CMakeLists.txt

@@ -48,7 +48,7 @@ add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
 
 if(OS_IS_MACOSX)
      if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-         set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -framework Accelerate")
+         set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -framework Accelerate -lc++")
      endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
 endif(OS_IS_MACOSX)
 

src/tests/CMakeLists.txt

@@ -139,7 +139,7 @@ include_directories(
 
 
 if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CLANG_FLAGS "-stdlib=libc++ -std=c++11")
+    set(CLANG_FLAGS "-stdlib=libc++ -std=c++11 -lc++")
 endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")