From 8857d3938eb35c463d438ac6c67b489eb7471e91 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sun, 18 Nov 2018 20:57:21 +0100 Subject: [PATCH] Apply some cleaning --- cmake/Modules/FindGFlags.cmake | 1 - cmake/Modules/FindGLOG.cmake | 2 +- cmake/Modules/FindGPSTK.cmake | 2 +- cmake/Modules/FindGnssSimulator.cmake | 2 +- cmake/Modules/FindGperftools.cmake | 2 +- cmake/Modules/FindGrDbfcttc.cmake | 2 +- cmake/Modules/FindGrOsmoSDR.cmake | 4 ++-- cmake/Modules/FindLibOsmoSDR.cmake | 2 +- cmake/Modules/FindLog4cpp.cmake | 2 +- cmake/Modules/FindMATIO.cmake | 16 ++++++++-------- cmake/Modules/FindORC.cmake | 2 +- cmake/Modules/FindOpenBLAS.cmake | 24 ++++++++++++------------ cmake/Modules/FindPCAP.cmake | 20 ++++++++++---------- cmake/Modules/FindPugiXML.cmake | 2 +- cmake/Modules/FindVolkGnssSdr.cmake | 2 +- cmake/Modules/TestForARM.cmake | 6 +++--- 16 files changed, 45 insertions(+), 46 deletions(-) diff --git a/cmake/Modules/FindGFlags.cmake b/cmake/Modules/FindGFlags.cmake index a0ca5ac79..d8279ba00 100644 --- a/cmake/Modules/FindGFlags.cmake +++ b/cmake/Modules/FindGFlags.cmake @@ -99,4 +99,3 @@ ELSE(GFlags_ROOT_DIR) MESSAGE(STATUS "Cannot find gflags") SET(GFlags_FOUND false) ENDIF(GFlags_ROOT_DIR) - diff --git a/cmake/Modules/FindGLOG.cmake b/cmake/Modules/FindGLOG.cmake index 7c50d8805..112f2c39d 100644 --- a/cmake/Modules/FindGLOG.cmake +++ b/cmake/Modules/FindGLOG.cmake @@ -41,7 +41,7 @@ endif(MSVC) macro(_FIND_GLOG_LIBRARIES _var) find_library(${_var} NAMES ${ARGN} - PATHS ${LIB_PATHS} + PATHS ${LIB_PATHS} /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib/i386-linux-gnu diff --git a/cmake/Modules/FindGPSTK.cmake b/cmake/Modules/FindGPSTK.cmake index 137a34b5b..810bda0d8 100644 --- a/cmake/Modules/FindGPSTK.cmake +++ b/cmake/Modules/FindGPSTK.cmake @@ -35,7 +35,7 @@ FIND_LIBRARY(GPSTK_LIBRARY NAMES ${GPSTK_NAMES} /usr/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 INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPSTK DEFAULT_MSG GPSTK_LIBRARY GPSTK_INCLUDE_DIR) diff --git a/cmake/Modules/FindGnssSimulator.cmake b/cmake/Modules/FindGnssSimulator.cmake index 56bccc709..88e6c2d27 100644 --- a/cmake/Modules/FindGnssSimulator.cmake +++ b/cmake/Modules/FindGnssSimulator.cmake @@ -25,4 +25,4 @@ find_program(SW_GENERATOR_BIN gnss_sim INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(GNSS-SIMULATOR DEFAULT_MSG SW_GENERATOR_BIN) -MARK_AS_ADVANCED(SW_GENERATOR_BIN) \ No newline at end of file +MARK_AS_ADVANCED(SW_GENERATOR_BIN) diff --git a/cmake/Modules/FindGperftools.cmake b/cmake/Modules/FindGperftools.cmake index 6e4d955b7..2dc57430e 100644 --- a/cmake/Modules/FindGperftools.cmake +++ b/cmake/Modules/FindGperftools.cmake @@ -66,4 +66,4 @@ mark_as_advanced( GPERFTOOLS_PROFILER GPERFTOOLS_TCMALLOC_AND_PROFILER GPERFTOOLS_LIBRARIES - GPERFTOOLS_INCLUDE_DIR) \ No newline at end of file + GPERFTOOLS_INCLUDE_DIR) diff --git a/cmake/Modules/FindGrDbfcttc.cmake b/cmake/Modules/FindGrDbfcttc.cmake index 0245514d8..9f4da77f8 100644 --- a/cmake/Modules/FindGrDbfcttc.cmake +++ b/cmake/Modules/FindGrDbfcttc.cmake @@ -28,7 +28,7 @@ FIND_PATH( HINTS $ENV{GR_DBFCTTC_DIR}/include ${PC_GR_DBFCTTC_INCLUDEDIR} PATHS ${CMAKE_INSTALL_PREFIX}/include - /usr/include + /usr/include /usr/local/include ) diff --git a/cmake/Modules/FindGrOsmoSDR.cmake b/cmake/Modules/FindGrOsmoSDR.cmake index 254fecef1..ae637846a 100644 --- a/cmake/Modules/FindGrOsmoSDR.cmake +++ b/cmake/Modules/FindGrOsmoSDR.cmake @@ -36,7 +36,7 @@ if(NOT GROSMOSDR_FOUND) pkg_check_modules (GROSMOSDR_PKG gnuradio-osmosdr) - find_path(GROSMOSDR_INCLUDE_DIR + find_path(GROSMOSDR_INCLUDE_DIR NAMES osmosdr/source.h osmosdr/api.h PATHS @@ -45,7 +45,7 @@ if(NOT GROSMOSDR_FOUND) /usr/local/include ) - find_library(GROSMOSDR_LIBRARIES + find_library(GROSMOSDR_LIBRARIES NAMES gnuradio-osmosdr PATHS ${GROSMOSDR_PKG_LIBRARY_DIRS} diff --git a/cmake/Modules/FindLibOsmoSDR.cmake b/cmake/Modules/FindLibOsmoSDR.cmake index fc7a28b06..d0dff5360 100644 --- a/cmake/Modules/FindLibOsmoSDR.cmake +++ b/cmake/Modules/FindLibOsmoSDR.cmake @@ -25,7 +25,7 @@ # Variables defined by this module: # # 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 diff --git a/cmake/Modules/FindLog4cpp.cmake b/cmake/Modules/FindLog4cpp.cmake index 3b1e7560e..96ea923f6 100644 --- a/cmake/Modules/FindLog4cpp.cmake +++ b/cmake/Modules/FindLog4cpp.cmake @@ -92,4 +92,4 @@ else () message(STATUS "Looked for LOG4CPP libraries named ${LOG4CPPS_NAMES}.") message(FATAL_ERROR "Could NOT find LOG4CPP library") endif () -endif () \ No newline at end of file +endif () diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index 2bac55ede..e27ed1f86 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -25,26 +25,26 @@ # MATIO_LIBRARIES - MATIO libraries. # MATIO_INCLUDE_DIRS - where to find matio.h, etc.. # MATIO_VERSION_STRING - version number as a string (e.g.: "1.3.4") -# +# #============================================================================= # Copyright 2015 Avtech Scientific -# +# # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions # are met: -# +# # * Redistributions of source code must retain the above copyright # notice, this list of conditions and the following disclaimer. -# +# # * Redistributions in binary form must reproduce the above copyright # notice, this list of conditions and the following disclaimer in the # documentation and/or other materials provided with the distribution. -# +# # * Neither the names of Kitware, Inc., the Insight Software Consortium, # nor the names of their contributors may be used to endorse or promote # products derived from this software without specific prior written # permission. -# +# # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT # LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR @@ -103,7 +103,7 @@ endif () 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 include(FindPackageHandleStandardArgs) 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) set(MATIO_LIBRARIES) set(MATIO_INCLUDE_DIRS) -endif(MATIO_FOUND) \ No newline at end of file +endif(MATIO_FOUND) diff --git a/cmake/Modules/FindORC.cmake b/cmake/Modules/FindORC.cmake index 2751494ba..24249b08c 100644 --- a/cmake/Modules/FindORC.cmake +++ b/cmake/Modules/FindORC.cmake @@ -63,4 +63,4 @@ SET(ORC_LIBRARY_DIRS ${ORC_LIBRARY_DIR}) INCLUDE(FindPackageHandleStandardArgs) 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) \ No newline at end of file +mark_as_advanced(ORC_INCLUDE_DIR ORC_LIBRARY ORCC_EXECUTABLE) diff --git a/cmake/Modules/FindOpenBLAS.cmake b/cmake/Modules/FindOpenBLAS.cmake index 133de9b63..d9ce2a333 100644 --- a/cmake/Modules/FindOpenBLAS.cmake +++ b/cmake/Modules/FindOpenBLAS.cmake @@ -17,21 +17,21 @@ # - 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 -SET(OPEN_BLAS_SEARCH_PATHS /lib/ - /lib64/ - /usr/lib - /usr/lib64 - /usr/local/lib - /usr/local/lib64 - /opt/OpenBLAS/lib - /opt/local/lib - /usr/lib/openblas-base - $ENV{OPENBLAS_HOME}/lib +SET(OPEN_BLAS_SEARCH_PATHS /lib/ + /lib64/ + /usr/lib + /usr/lib64 + /usr/local/lib + /usr/local/lib64 + /opt/OpenBLAS/lib + /opt/local/lib + /usr/lib/openblas-base + $ENV{OPENBLAS_HOME}/lib ) - + FIND_LIBRARY(OPENBLAS NAMES openblas PATHS ${OPEN_BLAS_SEARCH_PATHS}) IF (OPENBLAS) diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake index 3be89420e..679d8ef08 100644 --- a/cmake/Modules/FindPCAP.cmake +++ b/cmake/Modules/FindPCAP.cmake @@ -37,16 +37,16 @@ # Find the PCAP includes and library # 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. -# +# # PCAP_INCLUDE_DIRS - where to find pcap.h, etc. # PCAP_LIBRARIES - List of libraries when using pcap. # PCAP_FOUND - True if pcap found. IF(EXISTS $ENV{PCAPDIR}) - FIND_PATH(PCAP_INCLUDE_DIR + FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h pcap.h @@ -54,28 +54,28 @@ IF(EXISTS $ENV{PCAPDIR}) $ENV{PCAPDIR} NO_DEFAULT_PATH ) - + FIND_LIBRARY(PCAP_LIBRARY - NAMES + NAMES pcap PATHS $ENV{PCAPDIR} NO_DEFAULT_PATH ) - + ELSE(EXISTS $ENV{PCAPDIR}) - FIND_PATH(PCAP_INCLUDE_DIR + FIND_PATH(PCAP_INCLUDE_DIR NAMES pcap/pcap.h pcap.h ) - + FIND_LIBRARY(PCAP_LIBRARY - NAMES + NAMES pcap ) - + ENDIF(EXISTS $ENV{PCAPDIR}) SET(PCAP_INCLUDE_DIRS ${PCAP_INCLUDE_DIR}) diff --git a/cmake/Modules/FindPugiXML.cmake b/cmake/Modules/FindPugiXML.cmake index e1e8df872..a2b546179 100644 --- a/cmake/Modules/FindPugiXML.cmake +++ b/cmake/Modules/FindPugiXML.cmake @@ -66,4 +66,4 @@ else (PUGIXML_FOUND) message (STATUS "PugiXML not found.") endif(PUGIXML_FOUND) -mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) \ No newline at end of file +mark_as_advanced (PUGIXML_LIBRARY PUGIXML_INCLUDE_DIR) diff --git a/cmake/Modules/FindVolkGnssSdr.cmake b/cmake/Modules/FindVolkGnssSdr.cmake index 6225f38a0..ecc12685a 100644 --- a/cmake/Modules/FindVolkGnssSdr.cmake +++ b/cmake/Modules/FindVolkGnssSdr.cmake @@ -46,4 +46,4 @@ FIND_LIBRARY( INCLUDE(FindPackageHandleStandardArgs) 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) \ No newline at end of file +MARK_AS_ADVANCED(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS) diff --git a/cmake/Modules/TestForARM.cmake b/cmake/Modules/TestForARM.cmake index 9a5445287..254c5bc41 100644 --- a/cmake/Modules/TestForARM.cmake +++ b/cmake/Modules/TestForARM.cmake @@ -16,7 +16,7 @@ # along with GNSS-SDR. If not, see . ############################################################################## -# 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. # # - Anthony Arnold @@ -89,9 +89,9 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") else (ARM_VERSION STREQUAL "") message(STATUS "ARM version ${ARM_VERSION} detected") endif (ARM_VERSION STREQUAL "") - + else (NOT ARM_FOUND STREQUAL "") - message(STATUS "System is not ARM") + message(STATUS "System is not ARM") endif(NOT ARM_FOUND STREQUAL "") else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")