[hamradio-commits] [gnss-sdr] 17/27: Link dependencies
Carles Fernandez
carles_fernandez-guest at moszumanska.debian.org
Fri May 1 08:09:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
carles_fernandez-guest pushed a commit to branch next
in repository gnss-sdr.
commit 9ecf17a602fdf38a0d07eda1a729a196fa80740f
Author: Anthony Arnold <anthony.arnold at uqconnect.ed.au>
Date: Thu Apr 30 17:18:15 2015 +1000
Link dependencies
---
CMakeLists.txt | 6 +--
src/algorithms/libs/CMakeLists.txt | 16 +++----
.../gnuradio_blocks/CMakeLists.txt | 10 ++---
.../tracking/gnuradio_blocks/CMakeLists.txt | 6 +--
src/main/CMakeLists.txt | 24 +++++------
src/utils/front-end-cal/CMakeLists.txt | 49 +++++++++++-----------
6 files changed, 55 insertions(+), 56 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53d874c..8da02b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -394,7 +394,7 @@ set(VOLK_GNSSSDR_BUILD_COMMAND "make")
if(OS_IS_MACOSX)
set(USE_MACPORTS_PYTHON "-DPYTHON_EXECUTABLE=/opt/local/bin/python")
if(CMAKE_GENERATOR STREQUAL Xcode)
- set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
+ set(VOLK_GNSSSDR_BUILD_COMMAND "xcodebuild" "-configuration" "Debug" "-target")
endif(CMAKE_GENERATOR STREQUAL Xcode)
endif(OS_IS_MACOSX)
if(NOT VOLK_GNSSSDR_FOUND)
@@ -440,11 +440,11 @@ if (NOT GFlags_FOUND)
message (STATUS " gflags library has not been found.")
message (STATUS " gflags will be downloaded and built automatically ")
message (STATUS " when doing 'make'. ")
-
+
ExternalProject_Add(
gflags-${gflags_RELEASE}
PREFIX ${CMAKE_CURRENT_BINARY_DIR}/gflags-${gflags_RELEASE}
- GIT_REPOSITORY git://github.com/gflags/gflags.git
+ GIT_REPOSITORY https://github.com/gflags/gflags
GIT_TAG v${gflags_RELEASE}
DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/download/gflags-${gflags_RELEASE}
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/gflags/gflags-${gflags_RELEASE}
diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt
index 90ce61d..4525911 100644
--- a/src/algorithms/libs/CMakeLists.txt
+++ b/src/algorithms/libs/CMakeLists.txt
@@ -31,8 +31,8 @@ set(GNSS_SPLIBS_SOURCES
short_x2_to_cshort.cc
complex_float_to_complex_byte.cc
)
-
-
+
+
if(OPENCL_FOUND)
set(GNSS_SPLIBS_SOURCES ${GNSS_SPLIBS_SOURCES}
fft_execute.cc # Needs OpenCL
@@ -69,12 +69,12 @@ add_library(gnss_sp_libs ${GNSS_SPLIBS_SOURCES} ${GNSS_SPLIBS_HEADERS})
source_group(Headers FILES ${GNSS_SPLIBS_HEADERS})
target_link_libraries(gnss_sp_libs ${GNURADIO_RUNTIME_LIBRARIES}
- ${VOLK_LIBRARIES}
- ${VOLK_GNSSSDR_LIBRARIES}
- ${GNURADIO_BLOCKS_LIBRARIES}
- ${GNURADIO_FFT_LIBRARIES}
- ${GNURADIO_FILTER_LIBRARIES}
- ${OPT_LIBRARIES}
+ ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
+ ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
+ ${GNURADIO_BLOCKS_LIBRARIES}
+ ${GNURADIO_FFT_LIBRARIES}
+ ${GNURADIO_FILTER_LIBRARIES}
+ ${OPT_LIBRARIES}
gnss_rx
)
diff --git a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
index 2d2537b..375a014 100644
--- a/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/signal_generator/gnuradio_blocks/CMakeLists.txt
@@ -32,10 +32,8 @@ include_directories(
file(GLOB SIGNAL_GENERATOR_BLOCK_HEADERS "*.h")
add_library(signal_generator_blocks ${SIGNAL_GENERATOR_BLOCK_SOURCES} ${SIGNAL_GENERATOR_BLOCK_HEADERS})
source_group(Headers FILES ${SIGNAL_GENERATOR_BLOCK_HEADERS})
-target_link_libraries(signal_generator_blocks gnss_system_parameters
- ${GNURADIO_RUNTIME_LIBRARIES}
- ${GNURADIO_FFT_LIBRARIES}
- ${VOLK_LIBRARIES}
+target_link_libraries(signal_generator_blocks gnss_system_parameters
+ ${GNURADIO_RUNTIME_LIBRARIES}
+ ${GNURADIO_FFT_LIBRARIES}
+ ${VOLK_LIBRARIES} ${ORC_LIBRARIES}
)
-
-
diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
index 17635be..eec2ce0 100644
--- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
+++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
@@ -16,7 +16,7 @@
# along with GNSS-SDR. If not, see <http://www.gnu.org/licenses/>.
#
-set(TRACKING_GR_BLOCKS_SOURCES
+set(TRACKING_GR_BLOCKS_SOURCES
galileo_e1_dll_pll_veml_tracking_cc.cc
galileo_volk_e1_dll_pll_veml_tracking_cc.cc
galileo_e1_tcp_connector_tracking_cc.cc
@@ -26,7 +26,7 @@ set(TRACKING_GR_BLOCKS_SOURCES
gps_l1_ca_tcp_connector_tracking_cc.cc
galileo_e5a_dll_pll_tracking_cc.cc
)
-
+
include_directories(
$(CMAKE_CURRENT_SOURCE_DIR)
${CMAKE_SOURCE_DIR}/src/core/system_parameters
@@ -48,7 +48,7 @@ endif(ENABLE_GENERIC_ARCH)
file(GLOB TRACKING_GR_BLOCKS_HEADERS "*.h")
add_library(tracking_gr_blocks ${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_HEADERS})
source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
-target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} )
+target_link_libraries(tracking_gr_blocks tracking_lib ${GNURADIO_RUNTIME_LIBRARIES} gnss_sp_libs ${Boost_LIBRARIES} ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES} )
if(NOT VOLK_GNSSSDR_FOUND)
add_dependencies(tracking_gr_blocks volk_gnsssdr_module)
endif(NOT VOLK_GNSSSDR_FOUND)
\ No newline at end of file
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 9ac9c89..af8e7bc 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -29,7 +29,7 @@ endif(ENABLE_GPERFTOOLS)
if(ENABLE_UHD)
set(GNSS_SDR_OPTIONAL_LIBS ${GNSS_SDR_OPTIONAL_LIBS} ${UHD_LIBRARIES} ${GNURADIO_UHD_LIBRARIES})
- set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS})
+ set(GNSS_SDR_OPTIONAL_HEADERS ${GNSS_SDR_OPTIONAL_HEADERS} ${UHD_INCLUDE_DIRS})
endif(ENABLE_UHD)
include_directories(
@@ -42,7 +42,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
${GLOG_INCLUDE_DIRS}
${GFlags_INCLUDE_DIRS}
- ${ARMADILLO_INCLUDE_DIRS}
+ ${ARMADILLO_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNSS_SDR_OPTIONAL_HEADERS}
@@ -65,18 +65,18 @@ add_custom_command(TARGET gnss-sdr POST_BUILD
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:gnss-sdr>
)
-target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
+target_link_libraries(gnss-sdr ${MAC_LIBRARIES}
${Boost_LIBRARIES}
- ${GNURADIO_RUNTIME_LIBRARIES}
- ${GNURADIO_BLOCKS_LIBRARIES}
- ${GNURADIO_FFT_LIBRARIES}
- ${GNURADIO_FILTER_LIBRARIES}
- ${GFlags_LIBS}
- ${GLOG_LIBRARIES}
- ${ARMADILLO_LIBRARIES}
+ ${GNURADIO_RUNTIME_LIBRARIES}
+ ${GNURADIO_BLOCKS_LIBRARIES}
+ ${GNURADIO_FFT_LIBRARIES}
+ ${GNURADIO_FILTER_LIBRARIES}
+ ${GFlags_LIBS}
+ ${GLOG_LIBRARIES}
+ ${ARMADILLO_LIBRARIES}
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
${GNSS_SDR_OPTIONAL_LIBS}
- gnss_sp_libs
+ gnss_sp_libs
gnss_rx
)
@@ -85,7 +85,7 @@ install(TARGETS gnss-sdr
RUNTIME DESTINATION bin
COMPONENT "gnss-sdr"
)
-
+
install(DIRECTORY ${CMAKE_SOURCE_DIR}/conf DESTINATION share/gnss-sdr
FILES_MATCHING PATTERN "*.conf"
)
diff --git a/src/utils/front-end-cal/CMakeLists.txt b/src/utils/front-end-cal/CMakeLists.txt
index a68ec0c..c3b462a 100644
--- a/src/utils/front-end-cal/CMakeLists.txt
+++ b/src/utils/front-end-cal/CMakeLists.txt
@@ -24,7 +24,7 @@ if(ENABLE_OSMOSDR)
${CMAKE_SOURCE_DIR}/src/core/system_parameters
${CMAKE_SOURCE_DIR}/src/core/interfaces
${CMAKE_SOURCE_DIR}/src/core/receiver
- ${CMAKE_SOURCE_DIR}/src/core/libs
+ ${CMAKE_SOURCE_DIR}/src/core/libs
${CMAKE_SOURCE_DIR}/src/core/libs/supl
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-rrlp
${CMAKE_SOURCE_DIR}/src/core/libs/supl/asn-supl
@@ -35,7 +35,7 @@ if(ENABLE_OSMOSDR)
${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${GNURADIO_BLOCKS_INCLUDE_DIRS}
- ${ARMADILLO_INCLUDE_DIRS}
+ ${ARMADILLO_INCLUDE_DIRS}
${Boost_INCLUDE_DIRS}
${VOLK_GNSSSDR_INCLUDE_DIRS}
)
@@ -43,15 +43,15 @@ if(ENABLE_OSMOSDR)
file(GLOB FRONT_END_CAL_HEADERS "*.h")
add_library(front_end_cal_lib ${FRONT_END_CAL_SOURCES} ${FRONT_END_CAL_HEADERS})
source_group(Headers FILES ${FRONT_END_CAL_HEADERS})
-
- target_link_libraries(front_end_cal_lib ${Boost_LIBRARIES}
- ${GNURADIO_RUNTIME_LIBRARIES}
- ${GNURADIO_BLOCKS_LIBRARIES}
- ${GFlags_LIBS}
- ${GLOG_LIBRARIES}
- ${ARMADILLO_LIBRARIES}
+
+ target_link_libraries(front_end_cal_lib ${Boost_LIBRARIES}
+ ${GNURADIO_RUNTIME_LIBRARIES}
+ ${GNURADIO_BLOCKS_LIBRARIES}
+ ${GFlags_LIBS}
+ ${GLOG_LIBRARIES}
+ ${ARMADILLO_LIBRARIES}
${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
- gnss_rx
+ gnss_rx
gnss_sp_libs
)
@@ -63,24 +63,25 @@ if(ENABLE_OSMOSDR)
add_custom_command(TARGET front-end-cal POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:front-end-cal>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:front-end-cal>)
-
-
- target_link_libraries(front-end-cal ${GNURADIO_RUNTIME_LIBRARIES}
- ${GNURADIO_BLOCKS_LIBRARIES}
- ${Boost_LIBRARIES}
- ${GFlags_LIBS}
- ${GLOG_LIBRARIES}
- ${ARMADILLO_LIBRARIES}
- gnss_rx
- gnss_sp_libs
+
+
+ target_link_libraries(front-end-cal ${GNURADIO_RUNTIME_LIBRARIES}
+ ${GNURADIO_BLOCKS_LIBRARIES}
+ ${Boost_LIBRARIES}
+ ${GFlags_LIBS}
+ ${GLOG_LIBRARIES}
+ ${ARMADILLO_LIBRARIES}
+ gnss_rx
+ gnss_sp_libs
front_end_cal_lib
+ ${VOLK_GNSSSDR_LIBRARIES} ${ORC_LIBRARIES}
)
- install(TARGETS front-end-cal
+ install(TARGETS front-end-cal
RUNTIME DESTINATION bin
COMPONENT "front-end-cal"
)
-
+
find_program(GZIP gzip
/bin
/usr/bin
@@ -93,7 +94,7 @@ if(ENABLE_OSMOSDR)
execute_process(COMMAND gzip -9 -c ${CMAKE_SOURCE_DIR}/docs/manpage/front-end-cal-manpage
WORKING_DIRECTORY ${CMAKE_BINARY_DIR} OUTPUT_FILE "${CMAKE_BINARY_DIR}/front-end-cal.1.gz")
- install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1)
+ install(FILES ${CMAKE_BINARY_DIR}/front-end-cal.1.gz DESTINATION share/man/man1)
endif(NOT GZIP_NOTFOUND)
-
+
endif(ENABLE_OSMOSDR)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/gnss-sdr.git
More information about the pkg-hamradio-commits
mailing list