mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-10-25 20:47:39 +00:00
Code Issues Releases Wiki Activity

Apply some cleaning

Browse Source
This commit is contained in:
Carles Fernandez
2018-11-18 20:57:21 +01:00
parent 61b9a00827
commit 8857d3938e
16 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/Modules/FindGFlags.cmake
View File

@@ -99,4 +99,3 @@ ELSE(GFlags_ROOT_DIR)
MESSAGE(STATUS "Cannot find gflags") MESSAGE(STATUS "Cannot find gflags")
SET(GFlags_FOUND false) SET(GFlags_FOUND false)
ENDIF(GFlags_ROOT_DIR) ENDIF(GFlags_ROOT_DIR)

2
cmake/Modules/FindGLOG.cmake
View File

@@ -41,7 +41,7 @@ endif(MSVC)
macro(_FIND_GLOG_LIBRARIES _var) macro(_FIND_GLOG_LIBRARIES _var)
find_library(${_var} find_library(${_var}
NAMES ${ARGN} NAMES ${ARGN}
PATHS ${LIB_PATHS} PATHS ${LIB_PATHS}
/usr/local/lib /usr/local/lib
/usr/lib/x86_64-linux-gnu /usr/lib/x86_64-linux-gnu
/usr/lib/i386-linux-gnu /usr/lib/i386-linux-gnu

2
cmake/Modules/FindGPSTK.cmake
View File

@@ -35,7 +35,7 @@ FIND_LIBRARY(GPSTK_LIBRARY NAMES ${GPSTK_NAMES}
/usr/local/lib /usr/local/lib
/opt/local/lib ) /opt/local/lib )
# handle the QUIETLY and REQUIRED arguments and set GPSTK_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set GPSTK_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR)

2
cmake/Modules/FindGnssSimulator.cmake
View File

@@ -25,4 +25,4 @@ find_program(SW_GENERATOR_BIN gnss_sim
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNSS-SIMULATOR DEFAULT_MSG SW_GENERATOR_BIN) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNSS-SIMULATOR DEFAULT_MSG SW_GENERATOR_BIN)
MARK_AS_ADVANCED(SW_GENERATOR_BIN) MARK_AS_ADVANCED(SW_GENERATOR_BIN)

2
cmake/Modules/FindGperftools.cmake
View File

@@ -66,4 +66,4 @@ mark_as_advanced(
GPERFTOOLS_PROFILER GPERFTOOLS_PROFILER
GPERFTOOLS_TCMALLOC_AND_PROFILER GPERFTOOLS_TCMALLOC_AND_PROFILER
GPERFTOOLS_LIBRARIES GPERFTOOLS_LIBRARIES
GPERFTOOLS_INCLUDE_DIR) GPERFTOOLS_INCLUDE_DIR)

2
cmake/Modules/FindGrDbfcttc.cmake
View File

@@ -28,7 +28,7 @@ FIND_PATH(
HINTS $ENV{GR_DBFCTTC_DIR}/include HINTS $ENV{GR_DBFCTTC_DIR}/include
${PC_GR_DBFCTTC_INCLUDEDIR} ${PC_GR_DBFCTTC_INCLUDEDIR}
PATHS ${CMAKE_INSTALL_PREFIX}/include PATHS ${CMAKE_INSTALL_PREFIX}/include
/usr/include /usr/include
/usr/local/include /usr/local/include
) )

4
cmake/Modules/FindGrOsmoSDR.cmake
View File

@@ -36,7 +36,7 @@
if(NOT GROSMOSDR_FOUND) if(NOT GROSMOSDR_FOUND)
pkg_check_modules (GROSMOSDR_PKG gnuradio-osmosdr) pkg_check_modules (GROSMOSDR_PKG gnuradio-osmosdr)
find_path(GROSMOSDR_INCLUDE_DIR find_path(GROSMOSDR_INCLUDE_DIR
NAMES osmosdr/source.h NAMES osmosdr/source.h
osmosdr/api.h osmosdr/api.h
PATHS PATHS
@@ -45,7 +45,7 @@ if(NOT GROSMOSDR_FOUND)
/usr/local/include /usr/local/include
) )
find_library(GROSMOSDR_LIBRARIES find_library(GROSMOSDR_LIBRARIES
NAMES gnuradio-osmosdr NAMES gnuradio-osmosdr
PATHS PATHS
${GROSMOSDR_PKG_LIBRARY_DIRS} ${GROSMOSDR_PKG_LIBRARY_DIRS}

2
cmake/Modules/FindLibOsmoSDR.cmake
View File

@@ -25,7 +25,7 @@
# Variables defined by this module: # Variables defined by this module:
# #
# LIBOSMOSDR_FOUND System has libosmosdr libs/headers # LIBOSMOSDR_FOUND System has libosmosdr libs/headers
# LIBOSMOSDR_LIBRARIES The libosmosdr libraries # LIBOSMOSDR_LIBRARIES The libosmosdr libraries
# LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers # LIBOSMOSDR_INCLUDE_DIR The location of libosmosdr headers

2
cmake/Modules/FindLog4cpp.cmake
View File

@@ -92,4 +92,4 @@ else ()
message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPPS_NAMES}.") message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPPS_NAMES}.")
message(FATAL_ERROR "Could NOT find LOG4CPP library") message(FATAL_ERROR "Could NOT find LOG4CPP library")
endif () endif ()
endif () endif ()

16
cmake/Modules/FindMATIO.cmake
View File

@@ -25,26 +25,26 @@
# MATIO_LIBRARIES - MATIO libraries. # MATIO_LIBRARIES - MATIO libraries.
# MATIO_INCLUDE_DIRS - where to find matio.h, etc.. # MATIO_INCLUDE_DIRS - where to find matio.h, etc..
# MATIO_VERSION_STRING - version number as a string (e.g.: "1.3.4") # MATIO_VERSION_STRING - version number as a string (e.g.: "1.3.4")
# #
#============================================================================= #=============================================================================
# Copyright 2015 Avtech Scientific <http://avtechscientific.com> # Copyright 2015 Avtech Scientific <http://avtechscientific.com>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
# are met: # are met:
# #
# * Redistributions of source code must retain the above copyright # * Redistributions of source code must retain the above copyright
# notice, this list of conditions and the following disclaimer. # notice, this list of conditions and the following disclaimer.
# #
# * Redistributions in binary form must reproduce the above copyright # * Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the # notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution. # documentation and/or other materials provided with the distribution.
# #
# * Neither the names of Kitware, Inc., the Insight Software Consortium, # * Neither the names of Kitware, Inc., the Insight Software Consortium,
# nor the names of their contributors may be used to endorse or promote # nor the names of their contributors may be used to endorse or promote
# products derived from this software without specific prior written # products derived from this software without specific prior written
# permission. # permission.
# #
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -103,7 +103,7 @@ endif ()
mark_as_advanced(MATIO_INCLUDE_DIR MATIO_LIBRARY) mark_as_advanced(MATIO_INCLUDE_DIR MATIO_LIBRARY)
# handle the QUIETLY and REQUIRED arguments and set MATIO_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set MATIO_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATIO REQUIRED_VARS MATIO_LIBRARY MATIO_INCLUDE_DIR VERSION_VAR MATIO_VERSION_STRING) FIND_PACKAGE_HANDLE_STANDARD_ARGS(MATIO REQUIRED_VARS MATIO_LIBRARY MATIO_INCLUDE_DIR VERSION_VAR MATIO_VERSION_STRING)
@@ -114,4 +114,4 @@ if(MATIO_FOUND)
else(MATIO_FOUND) else(MATIO_FOUND)
set(MATIO_LIBRARIES) set(MATIO_LIBRARIES)
set(MATIO_INCLUDE_DIRS) set(MATIO_INCLUDE_DIRS)
endif(MATIO_FOUND) endif(MATIO_FOUND)

2
cmake/Modules/FindORC.cmake
View File

@@ -63,4 +63,4 @@ SET(ORC_LIBRARY_DIRS ${ORC_LIBRARY_DIR})
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC "orc files" ORC_LIBRARY ORC_INCLUDE_DIR ORCC_EXECUTABLE) FIND_PACKAGE_HANDLE_STANDARD_ARGS(ORC "orc files" ORC_LIBRARY ORC_INCLUDE_DIR ORCC_EXECUTABLE)
mark_as_advanced(ORC_INCLUDE_DIR ORC_LIBRARY ORCC_EXECUTABLE) mark_as_advanced(ORC_INCLUDE_DIR ORC_LIBRARY ORCC_EXECUTABLE)

24
cmake/Modules/FindOpenBLAS.cmake
View File

@@ -17,21 +17,21 @@
# - Try to find OpenBLAS library (not headers!) # - Try to find OpenBLAS library (not headers!)
# #
# The following environment variable is optionally searched # The following environment variable is optionally searched
# OPENBLAS_HOME: Base directory where all OpenBlas components are found # OPENBLAS_HOME: Base directory where all OpenBlas components are found
SET(OPEN_BLAS_SEARCH_PATHS /lib/ SET(OPEN_BLAS_SEARCH_PATHS /lib/
/lib64/ /lib64/
/usr/lib /usr/lib
/usr/lib64 /usr/lib64
/usr/local/lib /usr/local/lib
/usr/local/lib64 /usr/local/lib64
/opt/OpenBLAS/lib /opt/OpenBLAS/lib
/opt/local/lib /opt/local/lib
/usr/lib/openblas-base /usr/lib/openblas-base
$ENV{OPENBLAS_HOME}/lib $ENV{OPENBLAS_HOME}/lib
) )
FIND_LIBRARY(OPENBLAS NAMES openblas PATHS ${OPEN_BLAS_SEARCH_PATHS}) FIND_LIBRARY(OPENBLAS NAMES openblas PATHS ${OPEN_BLAS_SEARCH_PATHS})
IF (OPENBLAS) IF (OPENBLAS)

20
cmake/Modules/FindPCAP.cmake
View File

@@ -37,16 +37,16 @@
# Find the PCAP includes and library # Find the PCAP includes and library
# http://www.tcpdump.org/ # http://www.tcpdump.org/
# #
# The environment variable PCAPDIR allows to specficy where to find # The environment variable PCAPDIR allows to specficy where to find
# libpcap in non standard location. # libpcap in non standard location.
# #
# PCAP_INCLUDE_DIRS - where to find pcap.h, etc. # PCAP_INCLUDE_DIRS - where to find pcap.h, etc.
# PCAP_LIBRARIES - List of libraries when using pcap. # PCAP_LIBRARIES - List of libraries when using pcap.
# PCAP_FOUND - True if pcap found. # PCAP_FOUND - True if pcap found.
IF(EXISTS $ENV{PCAPDIR}) IF(EXISTS $ENV{PCAPDIR})
FIND_PATH(PCAP_INCLUDE_DIR FIND_PATH(PCAP_INCLUDE_DIR
NAMES NAMES
pcap/pcap.h pcap/pcap.h
pcap.h pcap.h
@@ -54,28 +54,28 @@ IF(EXISTS $ENV{PCAPDIR})
$ENV{PCAPDIR} $ENV{PCAPDIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
FIND_LIBRARY(PCAP_LIBRARY FIND_LIBRARY(PCAP_LIBRARY
NAMES NAMES
pcap pcap
PATHS PATHS
$ENV{PCAPDIR} $ENV{PCAPDIR}
NO_DEFAULT_PATH NO_DEFAULT_PATH
) )
ELSE(EXISTS $ENV{PCAPDIR}) ELSE(EXISTS $ENV{PCAPDIR})
FIND_PATH(PCAP_INCLUDE_DIR FIND_PATH(PCAP_INCLUDE_DIR
NAMES NAMES
pcap/pcap.h pcap/pcap.h
pcap.h pcap.h
) )
FIND_LIBRARY(PCAP_LIBRARY FIND_LIBRARY(PCAP_LIBRARY
NAMES NAMES
pcap pcap
) )
ENDIF(EXISTS $ENV{PCAPDIR}) ENDIF(EXISTS $ENV{PCAPDIR})
SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR}) SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR})

2
cmake/Modules/FindPugiXML.cmake
View File

@@ -66,4 +66,4 @@ else (PUGIXML_FOUND)
message (STATUS "PugiXML not found.") message (STATUS "PugiXML not found.")
endif(PUGIXML_FOUND) endif(PUGIXML_FOUND)
mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR)

2
cmake/Modules/FindVolkGnssSdr.cmake
View File

@@ -46,4 +46,4 @@ FIND_LIBRARY(
INCLUDE(FindPackageHandleStandardArgs) INCLUDE(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK_GNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS) FIND_PACKAGE_HANDLE_STANDARD_ARGS(VOLK_GNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)
MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS) MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS)

6
cmake/Modules/TestForARM.cmake
View File

@@ -16,7 +16,7 @@
# along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>. # along with GNSS-SDR. If not, see <https://www.gnu.org/licenses/>.
############################################################################## ##############################################################################
# check if the compiler defines the architecture as ARM and set the # check if the compiler defines the architecture as ARM and set the
# version, if found. # version, if found.
# #
# - Anthony Arnold # - Anthony Arnold
@@ -89,9 +89,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
else (ARM_VERSION STREQUAL "") else (ARM_VERSION STREQUAL "")
message(STATUS "ARM version ${ARM_VERSION} detected") message(STATUS "ARM version ${ARM_VERSION} detected")
endif (ARM_VERSION STREQUAL "") endif (ARM_VERSION STREQUAL "")
else (NOT ARM_FOUND STREQUAL "") else (NOT ARM_FOUND STREQUAL "")
message(STATUS "System is not ARM") message(STATUS "System is not ARM")
endif(NOT ARM_FOUND STREQUAL "") endif(NOT ARM_FOUND STREQUAL "")
else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")