mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 20:50:33 +00:00
Code Issues Releases Wiki Activity

Update and clean CMake scripts

Browse Source
This commit is contained in:
Carles Fernandez 2019-02-04 20:29:42 +01:00
parent f1e4996091
commit b58b07fe01
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/algorithms/telemetry_decoder/adapters/CMakeLists.txt
View File

@ -61,7 +61,6 @@ target_link_libraries(telemetry_decoder_adapters
telemetry_decoder_lib telemetry_decoder_lib
) )
set_property(TARGET telemetry_decoder_adapters set_property(TARGET telemetry_decoder_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

23
src/algorithms/tracking/adapters/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -87,22 +87,6 @@ set(TRACKING_ADAPTER_HEADERS
${OPT_TRACKING_ADAPTERS_HEADERS} ${OPT_TRACKING_ADAPTERS_HEADERS}
) )
include_directories(
#${CMAKE_CURRENT_SOURCE_DIR}
#${CMAKE_SOURCE_DIR}/src/core/system_parameters
#${CMAKE_SOURCE_DIR}/src/core/interfaces
#${CMAKE_SOURCE_DIR}/src/core/receiver
#${CMAKE_SOURCE_DIR}/src/algorithms/tracking/gnuradio_blocks
#${CMAKE_SOURCE_DIR}/src/algorithms/tracking/libs
#${CMAKE_SOURCE_DIR}/src/algorithms/libs
#${ARMADILLO_INCLUDE_DIRS}
#${GLOG_INCLUDE_DIRS}
#${GFlags_INCLUDE_DIRS}
${GNURADIO_RUNTIME_INCLUDE_DIRS}
${VOLK_GNSSSDR_INCLUDE_DIRS}
${OPT_TRACKING_INCLUDE_DIRS}
)
list(SORT TRACKING_ADAPTER_HEADERS) list(SORT TRACKING_ADAPTER_HEADERS)
list(SORT TRACKING_ADAPTER_SOURCES) list(SORT TRACKING_ADAPTER_SOURCES)
@ -120,6 +104,11 @@ target_link_libraries(tracking_adapters
gnss_sdr_flags gnss_sdr_flags
) )
target_include_directories(tracking_adapters
PUBLIC
${OPT_TRACKING_INCLUDE_DIRS}
)
set_property(TARGET tracking_adapters set_property(TARGET tracking_adapters
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>

15
src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt
View File

@ -78,20 +78,16 @@ set(TRACKING_GR_BLOCKS_HEADERS
${OPT_TRACKING_BLOCKS_HEADERS} ${OPT_TRACKING_BLOCKS_HEADERS}
) )
include_directories(
${OPT_TRACKING_INCLUDES}
)
list(SORT TRACKING_GR_BLOCKS_HEADERS) list(SORT TRACKING_GR_BLOCKS_HEADERS)
list(SORT TRACKING_GR_BLOCKS_SOURCES) list(SORT TRACKING_GR_BLOCKS_SOURCES)
source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
add_library(tracking_gr_blocks add_library(tracking_gr_blocks
${TRACKING_GR_BLOCKS_SOURCES} ${TRACKING_GR_BLOCKS_SOURCES}
${TRACKING_GR_BLOCKS_HEADERS} ${TRACKING_GR_BLOCKS_HEADERS}
) )
source_group(Headers FILES ${TRACKING_GR_BLOCKS_HEADERS})
target_link_libraries(tracking_gr_blocks target_link_libraries(tracking_gr_blocks
PUBLIC PUBLIC
Boost::boost Boost::boost
@ -105,9 +101,10 @@ target_link_libraries(tracking_gr_blocks
${OPT_TRACKING_LIBRARIES} ${OPT_TRACKING_LIBRARIES}
) )
if(ENABLE_GENERIC_ARCH) target_include_directories(tracking_gr_blocks
target_compile_definitions(tracking_gr_blocks PUBLIC -DGENERIC_ARCH=1) PUBLIC
endif() ${OPT_TRACKING_INCLUDES}
)
set_property(TARGET tracking_gr_blocks set_property(TARGET tracking_gr_blocks
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES

19
src/algorithms/tracking/libs/CMakeLists.txt
View File

@ -1,4 +1,4 @@
# Copyright (C) 2012-2018 (see AUTHORS file for a list of contributors) # Copyright (C) 2012-2019 (see AUTHORS file for a list of contributors)
# #
# This file is part of GNSS-SDR. # This file is part of GNSS-SDR.
# #
@ -66,18 +66,6 @@ if(ENABLE_FPGA)
set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h) set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} fpga_multicorrelator.h dll_pll_conf_fpga.h)
endif() endif()
include_directories(
${OPT_TRACKING_INCLUDES}
)
if(ENABLE_GENERIC_ARCH)
add_definitions(-DGENERIC_ARCH=1)
endif()
if(SSE3_AVAILABLE)
add_definitions(-DHAVE_SSE3=1)
endif()
list(SORT TRACKING_LIB_HEADERS) list(SORT TRACKING_LIB_HEADERS)
list(SORT TRACKING_LIB_SOURCES) list(SORT TRACKING_LIB_SOURCES)
@ -98,6 +86,11 @@ target_link_libraries(tracking_lib
Glog::glog Glog::glog
) )
target_include_directories(tracking_lib
PUBLIC
${OPT_TRACKING_INCLUDES}
)
set_property(TARGET tracking_lib set_property(TARGET tracking_lib
APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>