Remove usage of uninitialized variables in CMake scripts

Remove all warnings emitted by cmake --warn-uninitialized ..
This commit is contained in:
Carles Fernandez
2020-02-29 14:33:09 +01:00
parent 1656463d04
commit 299cb1a2ee
40 changed files with 861 additions and 565 deletions
@@ -7,13 +7,13 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
if(ENABLE_FPGA)
set(ACQUISITION_LIB_SOURCES fpga_acquisition.cc)
set(ACQUISITION_LIB_HEADERS fpga_acquisition.h)
endif()
set(ACQUISITION_LIB_HEADERS acq_conf.h)
set(ACQUISITION_LIB_SOURCES acq_conf.cc)
set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} acq_conf.h)
set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} acq_conf.cc)
if(ENABLE_FPGA)
set(ACQUISITION_LIB_SOURCES ${ACQUISITION_LIB_SOURCES} fpga_acquisition.cc)
set(ACQUISITION_LIB_HEADERS ${ACQUISITION_LIB_HEADERS} fpga_acquisition.h)
endif()
list(SORT ACQUISITION_LIB_HEADERS)
list(SORT ACQUISITION_LIB_SOURCES)
@@ -12,6 +12,9 @@
# Project setup
########################################################################
cmake_minimum_required(VERSION 2.8.12)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "Release")
endif()
set(CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Choose build type: None Debug Release RelWithDebInfo MinSizeRel")
project(volk_gnsssdr)
enable_language(CXX)
@@ -74,6 +77,7 @@ else()
find_package(FILESYSTEM COMPONENTS Final Experimental)
endif()
set(MY_CXX_FLAGS "")
if((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT WIN32)
if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "6.1.1")
if(CMAKE_VERSION VERSION_LESS "3.1")
@@ -310,6 +314,9 @@ endif()
# Setup the package config file
########################################################################
# set variables found in the pc.in file
if(NOT LIB_SUFFIX)
set(LIB_SUFFIX "")
endif()
set(prefix ${CMAKE_INSTALL_PREFIX})
set(exec_prefix "\${prefix}")
set(libdir "\${exec_prefix}/lib${LIB_SUFFIX}")
@@ -117,7 +117,9 @@ include(CheckCXXSourceCompiles)
cmake_push_check_state()
set(CMAKE_REQUIRED_QUIET ${FILESYSTEM_FIND_QUIETLY})
if(FILESYSTEM_FIND_QUIETLY)
set(CMAKE_REQUIRED_QUIET ${FILESYSTEM_FIND_QUIETLY})
endif()
# All of our tests require C++17 or later
set(CMAKE_CXX_STANDARD 17)
@@ -11,30 +11,51 @@ set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE)
include(FindPkgConfig)
pkg_check_modules(PC_ORC "orc-0.4 > 0.4.22")
if(NOT ORC_ROOT)
set(ORC_ROOT_USER_PROVIDED /usr/local)
else()
set(ORC_ROOT_USER_PROVIDED ${ORC_ROOT})
endif()
if(DEFINED ENV{ORC_ROOT})
set(ORC_ROOT_USER_PROVIDED
${ORC_ROOT_USER_PROVIDED}
$ENV{ORC_ROOT}
)
endif()
set(ORC_ROOT_USER_PROVIDED
${ORC_ROOT_USER_PROVIDED}
${CMAKE_INSTALL_PREFIX}
)
if(PC_ORC_TOOLSDIR)
set(ORC_ROOT_USER_PROVIDED
${ORC_ROOT_USER_PROVIDED}
${PC_ORC_TOOLSDIR}
)
endif()
find_program(ORCC_EXECUTABLE orcc
HINTS ${PC_ORC_TOOLSDIR}
HINTS ${ORC_ROOT_USER_PROVIDED}/bin
PATHS /usr/bin
/usr/local/bin
/opt/local/bin
${ORC_ROOT}/bin
${CMAKE_INSTALL_PREFIX}/bin
)
find_path(ORC_INCLUDE_DIR
NAMES orc/orc.h
HINTS ${PC_ORC_INCLUDEDIR}
PATHS /usr/include
PATHS ${ORC_ROOT_USER_PROVIDED}/include
/usr/include
/usr/local/include
/opt/local/include
${ORC_ROOT}/include
${CMAKE_INSTALL_PREFIX}/include
PATH_SUFFIXES orc-0.4
)
find_path(ORC_LIBRARY_DIR
NAMES ${CMAKE_SHARED_LIBRARY_PREFIX}orc-0.4${CMAKE_SHARED_LIBRARY_SUFFIX}
HINTS ${PC_ORC_LIBDIR}
PATHS /usr/lib
PATHS ${ORC_ROOT_USER_PROVIDED}/lib
${ORC_ROOT_USER_PROVIDED}/lib64
/usr/lib
/usr/lib64
/usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu
@@ -52,22 +73,19 @@ find_path(ORC_LIBRARY_DIR
/usr/local/lib
/usr/local/lib64
/opt/local/lib
${ORC_ROOT}/lib
$ENV{ORC_ROOT}/lib
${ORC_ROOT}/lib${LIB_SUFFIX}
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
)
find_library(ORC_LIB orc-0.4
HINTS ${PC_ORC_LIBRARY_DIRS}
PATHS ${ORC_ROOT}/lib${LIB_SUFFIX}
${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}
PATHS ${ORC_ROOT_USER_PROVIDED}/lib
${ORC_ROOT_USER_PROVIDED}/lib64
)
list(APPEND ORC_LIBRARY
${ORC_LIB}
)
if(PC_ORC_VERSION)
set(ORC_VERSION ${PC_ORC_VERSION})
endif()
list(APPEND ORC_LIBRARY ${ORC_LIB})
set(ORC_INCLUDE_DIRS ${ORC_INCLUDE_DIR})
set(ORC_LIBRARIES ${ORC_LIBRARY})
@@ -145,6 +145,9 @@ function(VOLK_ADD_TEST test_name executable_name)
string(REPLACE ";" " " VOLK_TEST_ARGS "${VOLK_TEST_ARGS}")
#finally: append the test name to execute
if(NOT CMAKE_CROSSCOMPILING_EMULATOR)
set(CMAKE_CROSSCOMPILING_EMULATOR "")
endif()
file(APPEND ${sh_file} "${CMAKE_CROSSCOMPILING_EMULATOR} ${executable_name} ${VOLK_TEST_ARGS}\n")
#make the shell file executable
@@ -79,6 +79,9 @@ endif()
########################################################################
# determine passing architectures based on compile flag tests
########################################################################
if(NOT PYTHON_DASH_B)
set(PYTHON_DASH_B "")
endif()
execute_process(
COMMAND ${PYTHON_EXECUTABLE} ${PYTHON_DASH_B}
${PROJECT_SOURCE_DIR}/gen/volk_gnsssdr_compile_utils.py
@@ -405,6 +408,9 @@ else()
OUTPUT_VARIABLE cmake_c_compiler_version
)
endif()
if(NOT GRCBTU)
set(GRCBTU "")
endif()
set(COMPILER_INFO "${CMAKE_C_COMPILER}:::${CMAKE_C_FLAGS_${GRCBTU}} ${CMAKE_C_FLAGS}\n${CMAKE_CXX_COMPILER}:::${CMAKE_CXX_FLAGS_${GRCBTU}} ${CMAKE_CXX_FLAGS}\n")
foreach(machine_name ${available_machines})
@@ -7,17 +7,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
set(OBSERVABLES_LIB_HEADERS ${OBSERVABLES_LIB_HEADERS} obs_conf.h)
set(OBSERVABLES_LIB_SOURCES ${OBSERVABLES_LIB_SOURCES} obs_conf.cc)
list(SORT OBSERVABLES_LIB_HEADERS)
list(SORT OBSERVABLES_LIB_SOURCES)
source_group(Headers FILES ${OBSERVABLES_LIB_HEADERS})
source_group(Headers FILES obs_conf.h)
add_library(observables_libs
${OBSERVABLES_LIB_SOURCES}
${OBSERVABLES_LIB_HEADERS}
obs_conf.cc
obs_conf.h
)
target_link_libraries(observables_libs
@@ -9,6 +9,8 @@
# Optional drivers
set(OPT_DRIVER_SOURCES "")
set(OPT_DRIVER_HEADERS "")
if(ENABLE_RAW_UDP AND PCAP_FOUND)
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} custom_udp_signal_source.cc)
@@ -7,10 +7,11 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
set(OPT_DRIVER_SOURCES "")
set(OPT_DRIVER_HEADERS "")
if(ENABLE_RAW_UDP AND PCAP_FOUND)
set(OPT_DRIVER_SOURCES ${OPT_DRIVER_SOURCES} gr_complex_ip_packet_source.cc)
set(OPT_DRIVER_HEADERS ${OPT_DRIVER_HEADERS} gr_complex_ip_packet_source.h)
set(OPT_DRIVER_SOURCES gr_complex_ip_packet_source.cc)
set(OPT_DRIVER_HEADERS gr_complex_ip_packet_source.h)
endif()
@@ -7,7 +7,8 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
set(OPT_SIGNAL_SOURCE_LIB_SOURCES "")
set(OPT_SIGNAL_SOURCE_LIB_HEADERS "")
if(ENABLE_FMCOMMS2 OR ENABLE_AD9361)
set(OPT_SIGNAL_SOURCE_LIB_SOURCES ad9361_manager.cc)
set(OPT_SIGNAL_SOURCE_LIB_HEADERS ad9361_manager.h)
@@ -7,14 +7,13 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
set(OPT_TRACKING_ADAPTERS_SOURCES "")
set(OPT_TRACKING_ADAPTERS_HEADERS "")
if(ENABLE_CUDA)
set(OPT_TRACKING_ADAPTERS_SOURCES
${OPT_TRACKING_ADAPTERS_SOURCES}
gps_l1_ca_dll_pll_tracking_gpu.cc
)
set(OPT_TRACKING_ADAPTERS_HEADERS
${OPT_TRACKING_ADAPTERS_HEADERS}
gps_l1_ca_dll_pll_tracking_gpu.h
)
endif()
@@ -7,13 +7,14 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
set(OPT_TRACKING_BLOCKS_SOURCES "")
set(OPT_TRACKING_BLOCKS_HEADERS "")
if(ENABLE_CUDA)
set(OPT_TRACKING_BLOCKS_SOURCES
${OPT_TRACKING_BLOCKS_SOURCES}
gps_l1_ca_dll_pll_tracking_gpu_cc.cc
)
set(OPT_TRACKING_BLOCKS_HEADERS
${OPT_TRACKING_BLOCKS_HEADERS}
gps_l1_ca_dll_pll_tracking_gpu_cc.h
)
endif()
+2 -1
View File
@@ -42,7 +42,8 @@ set(TRACKING_LIB_HEADERS
exponential_smoother.h
)
set(OPT_TRACKING_LIBRARIES "")
set(OPT_TRACKING_INCLUDES "")
if(ENABLE_CUDA)
if(CMAKE_VERSION VERSION_GREATER 3.11)
set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} cuda_multicorrelator.cu)