From 8afa1be6cf46d787e1b42048fe93dac002438ecb Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 7 Nov 2014 18:23:59 +0100
Subject: [PATCH] Adding volk_gnsssdr

---
 CMakeLists.txt           | 29 +++++++++++++++++++++++++++--
 src/main/CMakeLists.txt  |  7 ++++++-
 src/tests/CMakeLists.txt |  2 ++
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b1f4c69e..0a10f8c9a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -351,9 +351,34 @@ endif()
 
 
 ################################################################################
-# volk_gnsssdr module
+# volk_gnsssdr module - GNSS-SDR's own VOLK library
 ################################################################################
-add_subdirectory(src/algorithms/libs/volk_gnsssdr_module)
+#add_subdirectory(src/algorithms/libs/volk_gnsssdr_module)
+ExternalProject_Add(volk_gnsssdr_module
+     PREFIX ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module
+     SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
+     BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build   
+     CMAKE_ARGS -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build  -DENABLE_STATIC_LIBS=ON
+     DOWNLOAD_COMMAND ""
+     UPDATE_COMMAND ""
+     PATCH_COMMAND ""
+     BUILD_COMMAND make
+     )
+find_package(ORC)
+if(NOT ORC_FOUND)
+     set(ORC_LIBRARIES "")
+     set(ORC_INCLUDE_DIRS "")
+endif(NOT ORC_FOUND)
+        
+add_library(volk_gnsssdr UNKNOWN IMPORTED)
+set_property(TARGET volk_gnsssdr PROPERTY IMPORTED_LOCATION ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build/lib/libvolk_gnsssdr.a)
+set(VOLK_GNSSSDR_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build/include/;${ORC_INCLUDE_DIRS}")
+set(VOLK_GNSSSDR_LIBRARIES volk_gnsssdr)
+
+add_custom_command(TARGET volk_gnsssdr_module POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile
+                                   ${CMAKE_SOURCE_DIR}/install/volk_gnsssdr_profile)
+
 
 
 ################################################################################
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 8335d554d..a233e3e94 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -41,6 +41,7 @@ include_directories(
      ${Boost_INCLUDE_DIRS}
      ${GNURADIO_RUNTIME_INCLUDE_DIRS}
      ${GNSS_SDR_OPTIONAL_HEADERS}
+     ${VOLK_GNSSSDR_INCLUDE_DIRS}
 )
 
 add_definitions( -DGNSS_SDR_VERSION="${VERSION}" )
@@ -56,7 +57,8 @@ add_executable(gnss-sdr ${CMAKE_CURRENT_SOURCE_DIR}/main.cc)
 
 add_custom_command(TARGET gnss-sdr POST_BUILD
                    COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:gnss-sdr>
-                                   ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>)
+                                   ${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
+                  )
 
 target_link_libraries(gnss-sdr ${MAC_LIBRARIES} 
                                ${Boost_LIBRARIES}
@@ -70,6 +72,7 @@ target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
                                ${UHD_LIBRARIES}
                                gnss_sp_libs 
                                gnss_rx
+                               ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
                                ${GNSS_SDR_OPTIONAL_LIBS}
                                )
 
@@ -84,6 +87,8 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION etc/gnss-sdr
         )
         
 install(DIRECTORY DESTINATION etc/gnss-sdr/data/)
+
 install(FILES ${CMAKE_SOURCE_DIR}/conf/gnss-sdr.conf DESTINATION etc/gnss-sdr/conf
         RENAME default.conf)
 
+install(PROGRAMS ${CMAKE_BINARY_DIR}/volk_gnsssdr_module/build/apps/volk_gnsssdr_profile DESTINATION bin)
\ No newline at end of file
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index cb90955c8..80c0d13da 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -133,6 +133,7 @@ include_directories(
      ${Boost_INCLUDE_DIRS}
      ${ARMADILLO_INCLUDE_DIRS}
      ${VOLK_INCLUDE_DIRS}
+     ${VOLK_GNSSSDR_INCLUDE_DIRS}
      ${GNSS_SDR_TEST_OPTIONAL_HEADERS}
 )
 
@@ -172,6 +173,7 @@ target_link_libraries(run_tests ${CLANG_FLAGS}
                                 signal_generator_adapters
                                 out_adapters
                                 pvt_gr_blocks
+                                ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
                                 ${GNSS_SDR_TEST_OPTIONAL_LIBS}
 )