Now GNSS-SDR also builds on Mac OS X 10.9 Mavericks using clang++ and libc++. Updated cmake scripts, some modification of code not accepted by clang. Updated README with instructions for Mavericks. Fixed file length computation in 64-bit architectures.

git-svn-id: https://svn.code.sf.net/p/gnss-sdr/code/trunk@435 64b25241-fba3-4117-9849-534c7e92360d
2025-10-24 03:57:39 +00:00 · 2013-11-09 10:51:11 +00:00
parent 4ebeb950fc
commit a8619337be
9 changed files with 146 additions and 79 deletions
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -52,7 +52,7 @@ include_directories(
 if(OPENCL_FOUND)
    include_directories( ${OPENCL_INCLUDE_DIRS} )
    if(OS_IS_MACOSX)
-         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") 
+         set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL")
    else(OS_IS_MACOSX)
         set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES})
    endif(OS_IS_MACOSX)
--- a/src/algorithms/libs/galileo_e1_signal_processing.cc
+++ b/src/algorithms/libs/galileo_e1_signal_processing.cc
@@ -122,8 +122,8 @@ galileo_e1_gen(std::complex<float>* _dest, int* _prn, char _Signal[3])
    const float alpha = sqrt(10.0 / 11.0);
    const float beta = sqrt(1.0 / 11.0);

-    std::complex<float> sinboc_11[_codeLength]; // 12*4092 (_codeLength not accepted by Clang )
-    std::complex<float> sinboc_61[_codeLength];
+    std::complex<float> sinboc_11[12*4092]; //  _codeLength not accepted by Clang
+    std::complex<float> sinboc_61[12*4092];

    galileo_e1_sinboc_11_gen(sinboc_11, _prn, _codeLength); //generate sinboc(1,1) 12 samples per chip
    galileo_e1_sinboc_61_gen(sinboc_61, _prn, _codeLength); //generate sinboc(6,1) 12 samples per chip
@@ -154,7 +154,7 @@ galileo_e1_code_gen_complex_sampled(std::complex<float>* _dest, char _Signal[3],
        bool _secondary_flag)
 {

-    // This function is based on the GNU software GPS for MATLAB in the Kay Borre bookç
+    // This function is based on the GNU software GPS for MATLAB in Kay Borre's book

    std::string _galileo_signal = _Signal;
    unsigned int _samplesPerCode;
--- a/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
+++ b/src/algorithms/signal_generator/gnuradio_blocks/signal_generator_c.cc
@@ -27,9 +27,6 @@
 *
 * -------------------------------------------------------------------------
 */
-//#ifdef HAVE_CONFIG_H
-//#include "config.h"
-//#endif

 #include "signal_generator_c.h"
 #include <gnuradio/io_signature.h>
@@ -57,23 +54,23 @@ signal_make_generator_c (std::vector<std::string> system, const std::vector<unsi
 * The private constructor
 */
 signal_generator_c::signal_generator_c (std::vector<std::string> system, const std::vector<unsigned int> &PRN,
-                              const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
-                              const std::vector<unsigned int> &delay_chips, bool data_flag, bool noise_flag,
-                              unsigned int fs_in, unsigned int vector_length, float BW_BB) :
+        const std::vector<float> &CN0_dB, const std::vector<float> &doppler_Hz,
+        const std::vector<unsigned int> &delay_chips, bool data_flag, bool noise_flag,
+        unsigned int fs_in, unsigned int vector_length, float BW_BB) :

-  gr::block ("signal_gen_cc", gr::io_signature::make(0, 0, sizeof(gr_complex)),
-                              gr::io_signature::make(1, 1, sizeof(gr_complex)*vector_length)),
-  system_(system),
-  PRN_(PRN),
-  CN0_dB_(CN0_dB),
-  doppler_Hz_(doppler_Hz),
-  delay_chips_(delay_chips),
-  data_flag_(data_flag),
-  noise_flag_(noise_flag),
-  fs_in_(fs_in),
-  num_sats_(PRN.size()),
-  vector_length_(vector_length),
-  BW_BB_(BW_BB*(float)fs_in/2.0)
+          gr::block ("signal_gen_cc", gr::io_signature::make(0, 0, sizeof(gr_complex)),
+                  gr::io_signature::make(1, 1, sizeof(gr_complex)*vector_length)),
+                  system_(system),
+                  PRN_(PRN),
+                  CN0_dB_(CN0_dB),
+                  doppler_Hz_(doppler_Hz),
+                  delay_chips_(delay_chips),
+                  data_flag_(data_flag),
+                  noise_flag_(noise_flag),
+                  fs_in_(fs_in),
+                  num_sats_(PRN.size()),
+                  vector_length_(vector_length),
+                  BW_BB_(BW_BB*(float)fs_in/2.0)
 {
    init();
    generate_codes();
@@ -143,7 +140,7 @@ void signal_generator_c::generate_codes()
            if (posix_memalign((void**)&(sampled_code_data_[sat]), 16,
                               vector_length_ * sizeof(gr_complex)) == 0){};

-            gr_complex code[samples_per_code_[sat]];
+            gr_complex code[8000];//[samples_per_code_[sat]];

            if (system_[sat] == "G")
                {
--- a/src/algorithms/signal_source/adapters/CMakeLists.txt
+++ b/src/algorithms/signal_source/adapters/CMakeLists.txt
@@ -90,5 +90,9 @@ include_directories(
     ${Boost_INCLUDE_DIRS}
 )

+if(ARCH_64BITS)
+    add_definitions(-DARCH_64BITS=1)
+endif(ARCH_64BITS)
+
 add_library(signal_source_adapters ${SIGNAL_SOURCE_ADAPTER_SOURCES})
 target_link_libraries(signal_source_adapters signal_source_gr_blocks ${Boost_LIBRARIES}  ${GNURADIO_PMT_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${UHD_LIBRARIES}  ${GNURADIO_UHD_LIBRARIES} ${OPT_LIBRARIES} gnss_sp_libs)
--- a/src/algorithms/signal_source/adapters/file_signal_source.cc
+++ b/src/algorithms/signal_source/adapters/file_signal_source.cc
@@ -142,13 +142,16 @@ FileSignalSource::FileSignalSource(ConfigurationInterface* configuration,

            if (size > 0)
                {
-                    samples_ = floor((double)size / (double)item_size() - ceil(0.002 * (double)sampling_frequency_)); //process all the samples available in the file excluding the last 2 ms
+                    samples_ = floor((double)size / (double)item_size() - ceil(0.002 * (double)sampling_frequency_)); //process all the samples available in the file excluding at least the last 1 ms
                }
        }

    CHECK(samples_ > 0) << "File does not contain enough samples to process.";
    double signal_duration_s;
    signal_duration_s = (double)samples_ * ( 1 /(double)sampling_frequency_);
+#ifdef ARCH_64BITS
+    signal_duration_s /= 2;
+#endif
    DLOG(INFO) << "Total number samples to be processed= " << samples_ << " GNSS signal duration= " << signal_duration_s << " [s]";
    std::cout << "GNSS signal recorded time to be processed: " << signal_duration_s << " [s]" << std::endl;

--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -34,9 +34,13 @@ include_directories(
 add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )

 if(OS_IS_MACOSX)
-     # Tell the linker where the libraries installed by MacPorts are
-     link_directories( /opt/local/lib ) # Not very elegant, to be fixed
-     set(MAC_LIBRARIES "-lstdc++")
+     if (MACOSX_MAVERICKS)
+         link_directories( /opt/local/lib /usr/local/lib) # Not very elegant, to be fixed
+         set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-blocks -lgnuradio-fft -lgnuradio-filter -lgnuradio-uhd ${GFlags_LIBS} ${GLOG_LIBRARIES}")
+     else(MACOSX_MAVERICKS)
+         link_directories( /opt/local/lib )  # Not very elegant, to be fixed
+         set(MAC_LIBRARIES "-lstdc++")
+     endif(MACOSX_MAVERICKS)
 endif(OS_IS_MACOSX)

 add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -25,17 +25,32 @@ endif(NOT EXISTS GTEST_DIR_LOCAL)
 if(NOT GTEST_DIR_LOCAL)
     # if GTEST_DIR is not defined, we download and build it
     set(gtest_RELEASE 1.7.0)
-     ExternalProject_Add(
-          gtest-${gtest_RELEASE}
-          URL http://googletest.googlecode.com/files/gtest-${gtest_RELEASE}.zip
-          DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../download/gtest-${gtest_RELEASE}
-          URL_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
-          SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}
-          BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}
-          UPDATE_COMMAND ""
-          PATCH_COMMAND ""
-          INSTALL_COMMAND ""
-     )
+     if(MACOSX_MAVERICKS)
+         ExternalProject_Add(
+              gtest-${gtest_RELEASE}
+              URL http://googletest.googlecode.com/files/gtest-${gtest_RELEASE}.zip
+              DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../download/gtest-${gtest_RELEASE}
+              URL_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
+              SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}
+              BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}
+              CMAKE_ARGS -DCMAKE_CXX_COMPILER=/usr/bin/clang++
+              UPDATE_COMMAND ""
+              PATCH_COMMAND ""
+              INSTALL_COMMAND ""
+         )
+     else(MACOSX_MAVERICKS)
+         ExternalProject_Add(
+              gtest-${gtest_RELEASE}
+              URL http://googletest.googlecode.com/files/gtest-${gtest_RELEASE}.zip
+              DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../download/gtest-${gtest_RELEASE}
+              URL_MD5 "2d6ec8ccdf5c46b05ba54a9fd1d130d7"
+              SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}
+              BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../../gtest-${gtest_RELEASE}
+              UPDATE_COMMAND ""
+              PATCH_COMMAND ""
+              INSTALL_COMMAND ""
+         )
+     endif(MACOSX_MAVERICKS)
     # Set up variables
     # Set recently downloaded and build Googletest root folder
     set(GTEST_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../../thirdparty/gtest/gtest-${gtest_RELEASE}")
@@ -101,13 +116,17 @@ find_library(
           /usr/lib64
 )
 if(OS_IS_MACOSX)
-     # Tell the linker where the libraries installed by MacPorts are
-     link_directories( /opt/local/lib ) # not very elegant, to be fixed
-     # set(MAC_LIBRARIES sdtc++)
+     if(MACOSX_MAVERICKS)
+         # Tell the linker where the libraries installed by MacPorts are
+         link_directories(/opt/local/lib /usr/local/lib ) # not very elegant, to be fixed
+         set(MAC_LIBRARIES "-stdlib=libc++ -std=c++11 -lgnuradio-runtime -lgnuradio-pmt -lgnuradio-blocks -lgnuradio-fft -lgnuradio-filter -lgnuradio-uhd")
+     else(MACOSX_MAVERICKS)
+         link_directories( /opt/local/lib ) # not very elegant, to be fixed
+     endif(MACOSX_MAVERICKS)
 endif(OS_IS_MACOSX)

 add_executable(run_tests ${CMAKE_CURRENT_SOURCE_DIR}/test_main.cc)
-target_link_libraries(run_tests ${Boost_LIBRARIES}  ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs gnss_rx)
+target_link_libraries(run_tests ${MAC_LIBRARIES} ${Boost_LIBRARIES}  ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} ${GNURADIO_RUNTIME_LIBRARIES} ${GNURADIO_BLOCKS_LIBRARIES} ${GNURADIO_FILTER_LIBRARIES} ${GNURADIO_ANALOG_LIBRARIES} gnss_sp_libs gnss_rx  signal_generator_blocks)

 install(TARGETS run_tests DESTINATION ${CMAKE_SOURCE_DIR}/install)

@@ -145,7 +164,7 @@ add_executable(gnss_block_test EXCLUDE_FROM_ALL
     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/file_output_filter_test.cc
     ${CMAKE_CURRENT_SOURCE_DIR}/gnss_block/gnss_block_factory_test.cc   
 )
-target_link_libraries(gnss_block_test ${Boost_LIBRARIES} ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} gnss_sp_libs gnss_rx)
+target_link_libraries(gnss_block_test ${Boost_LIBRARIES} ${GFLAGS_LIBS} ${GLOG_LIBRARIES} ${GTEST_LIBRARIES} gnss_sp_libs gnss_rx signal_generator_blocks)
 add_test(gnss_block_test gnss_block_test)