[hamradio-commits] [gnss-sdr] 04/16: Add option to launch volk_gnssssdr_profile after build

[Carles Fernandez]

This is an automated email from the git hooks/post-receive script.

carles_fernandez-guest pushed a commit to branch master
in repository gnss-sdr.

commit d92b3598d74d19ae4beaaa7ff0d1294feab43106
Author: Carles Fernandez <carles.fernandez at gmail.com>
Date:   Sat Jul 2 18:54:39 2016 +0200

    Add option to launch volk_gnssssdr_profile after build
---
 CMakeLists.txt                                                     | 2 ++
 .../libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt           | 5 +++--
 .../libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt      | 7 +++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d284ee8..01aa8fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -46,6 +46,7 @@ option(ENABLE_GPERFTOOLS "Enable linking to Gperftools libraries (tcmalloc and p
 option(ENABLE_GPROF "Enable the use of the GNU profiler tool 'gprof'" OFF)
 
 # Acceleration
+option(ENABLE_PROFILING "Enable execution of volk_gnsssdr_profile at the end of the building" OFF)
 option(ENABLE_OPENCL "Enable building of processing blocks implemented with OpenCL (experimental)" OFF)
 option(ENABLE_CUDA "Enable building of processing blocks implemented with CUDA (experimental, requires CUDA SDK)" OFF)
 
@@ -427,6 +428,7 @@ if(NOT VOLK_GNSSSDR_FOUND)
                                 -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER}
                                 -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/install
                                 -DENABLE_STATIC_LIBS=ON
+                                -DENABLE_PROFILING=${ENABLE_PROFILING}
                                 -DCMAKE_CXX_FLAGS=${CXX_FLAGS}
                                 -DCMAKE_C_FLAGS=${C_FLAGS}
                                 ${STRIP_VOLK_GNSSSDR_PROFILE} 
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
index c5a737f..7897ac8 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/CMakeLists.txt
@@ -265,8 +265,9 @@ message(STATUS "  Modify using: -DENABLE_TESTING=ON/OFF")
 # Option to enable post-build profiling using volk_profile, off by default
 ########################################################################
 OPTION(ENABLE_PROFILING "Launch system profiler after build" OFF)
-if(ENABLE_PROFILING)
-  if(DEFINED VOLK_CONFIGPATH)
+if(ENABLE_STATIC_LIBS)
+  set(ENABLE_STATIC_LIBS ON)
+  if(DEFINED VOLK_CONFIGPATH)  
     get_filename_component(VOLK_CONFIGPATH ${VOLK_CONFIGPATH} ABSOLUTE)
     set(VOLK_CONFIGPATH "${VOLK_CONFIGPATH}/volk_gnsssdr")
     message(STATUS "System profiling is enabled, using path: ${VOLK_CONFIGPATH}")
diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
index 7a8409f..1b52008 100644
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/apps/CMakeLists.txt
@@ -81,23 +81,22 @@ if(ENABLE_PROFILING)
         set( VOLK_CONFIG_ARG "-p${VOLK_CONFIGPATH}" )
         set( VOLK_CONFIG "${VOLK_CONFIGPATH}/volk_gnsssdr_config" )
    endif()
-message("++++++++++++++ ${VOLK_CONFIG}")
    add_custom_command(OUTPUT ${VOLK_CONFIG}
         COMMAND volk_gnsssdr_profile "${VOLK_CONFIG_ARG}"
         DEPENDS volk_gnsssdr_profile
         COMMENT "Launching profiler, this may take a few minutes..."
     )
     add_custom_target(volk-gnsssdr-profile-run ALL DEPENDS ${VOLK_CONFIG})
-   # target_link_libraries(volk-gnsssdr-profile-run  volk_gnsssdr ${Boost_LIBRARIES} ${Clang_required_link} ${orc_lib})
 endif()
 
 # 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} ${Clang_required_link} ${orc_lib})
 add_dependencies(volk_gnsssdr-config-info volk_gnsssdr)
-#install(
+
+# install(
 #    TARGETS volk_gnsssdr-config-info
 #    DESTINATION bin
 #    COMPONENT "volk_gnsssdr"
-#)
+# )
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git