Add cmake modules to cmakelint job and fix errors

2020-03-01 12:29:21 +01:00 · 2020-03-01 12:29:21 +01:00 · 4b3f777425
parent e638019d93
commit 4b3f777425
9 changed files with 42 additions and 28 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@ -92,7 +92,7 @@ jobs:
          sudo python -m pip install --upgrade pip
          sudo pip install cmakelint
      - name: check CMake scripts
-        run: find . -iname "CMakeLists.txt" | xargs cmakelint --filter=-linelength,-readability/wonkycase
+        run: find . -iname "CMakeLists.txt" -o -iname "*.cmake" | xargs cmakelint --filter=-linelength,-readability/wonkycase


  volk-gnsssdr-windows:
--- a/cmake/Modules/FindFILESYSTEM.cmake
+++ b/cmake/Modules/FindFILESYSTEM.cmake
@ -255,6 +255,9 @@ cmake_pop_check_state()

 set(FILESYSTEM_FOUND ${_found} CACHE BOOL "TRUE if we can compile and link a program using std::filesystem" FORCE)

+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FILESYSTEM DEFAULT_MSG FILESYSTEM_FOUND)
+
 if(FILESYSTEM_FIND_REQUIRED AND NOT FILESYSTEM_FOUND)
    message(FATAL_ERROR "Cannot compile a simple program using std::filesystem")
 endif()
--- a/cmake/Modules/FindGNURADIO.cmake
+++ b/cmake/Modules/FindGNURADIO.cmake
@ -13,6 +13,7 @@
 if(NOT COMMAND feature_summary)
    include(FeatureSummary)
 endif()
+include(FindPackageHandleStandardArgs)

 # if GR_REQUIRED_COMPONENTS is not defined, it will be set to the following list
 if(NOT GR_REQUIRED_COMPONENTS)
@ -240,6 +241,9 @@ endif()
 if(NOT DEFINED GNURADIO_FOUND)
    set(GNURADIO_FOUND TRUE)
 endif()
+
+find_package_handle_standard_args(GNURADIO DEFAULT_MSG GNURADIO_FOUND)
+
 set(GNURADIO_VERSION ${PC_GNURADIO_RUNTIME_VERSION})

 if(NOT GNSSSDR_GNURADIO_MIN_VERSION)
@ -328,7 +332,7 @@ if(GNURADIO_VERSION VERSION_GREATER 3.8.99)
        message(STATUS " * LIBS=${GNURADIO_IIO_LIBRARIES}")
    endif()
    if(GNURADIO_IIO_LIBRARIES AND GNURADIO_IIO_INCLUDE_DIRS)
-       set(GNURADIO_IIO_FOUND TRUE)
+        set(GNURADIO_IIO_FOUND TRUE)
    endif()
    if(GNURADIO_IIO_FOUND)
        message(STATUS "GNURADIO_IIO_FOUND = ${GNURADIO_IIO_FOUND}")
--- a/cmake/Modules/FindLOG4CPP.cmake
+++ b/cmake/Modules/FindLOG4CPP.cmake
@ -142,14 +142,14 @@ else()
    )
 endif()

-if (LOG4CPP_FOUND AND NOT TARGET Log4cpp::log4cpp)
-  add_library(Log4cpp::log4cpp SHARED IMPORTED)
-  set_target_properties(Log4cpp::log4cpp PROPERTIES
-      IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-      IMPORTED_LOCATION "${LOG4CPP_LIBRARIES}"
-      INTERFACE_INCLUDE_DIRECTORIES "${LOG4CPP_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES "${LOG4CPP_LIBRARIES}"
-  )
+if(LOG4CPP_FOUND AND NOT TARGET Log4cpp::log4cpp)
+    add_library(Log4cpp::log4cpp SHARED IMPORTED)
+    set_target_properties(Log4cpp::log4cpp PROPERTIES
+        IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
+        IMPORTED_LOCATION "${LOG4CPP_LIBRARIES}"
+        INTERFACE_INCLUDE_DIRECTORIES "${LOG4CPP_INCLUDE_DIRS}"
+        INTERFACE_LINK_LIBRARIES "${LOG4CPP_LIBRARIES}"
+    )
 endif()

 mark_as_advanced(LOG4CPP_LIBRARIES LOG4CPP_INCLUDE_DIRS)
--- a/cmake/Modules/FindOPENCL.cmake
+++ b/cmake/Modules/FindOPENCL.cmake
@ -92,9 +92,9 @@ find_path(_OPENCL_CPP_INCLUDE_DIRS
        ENV OCL_ROOT
        /usr/local/cuda/include
    PATH_SUFFIXES
-       include
-       OpenCL/common/inc
-       "AMD APP/include"
+        include
+        OpenCL/common/inc
+        "AMD APP/include"
 )

 set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR})
@ -105,7 +105,7 @@ if(_OPENCL_CPP_INCLUDE_DIRS)
    list(REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS)
 endif()

-_FIND_OPENCL_VERSION()
+_find_opencl_version()

 if(WIN32)
    if(CMAKE_SIZEOF_VOID_P EQUAL 4)
--- a/cmake/Toolchains/zynq-7000.cmake
+++ b/cmake/Toolchains/zynq-7000.cmake
@ -18,17 +18,21 @@ set(CMAKE_SYSROOT /home/carlesfernandez/binary)  ### POINT THIS TO YOUR ROOTFS
 set(CMAKE_C_COMPILER    /usr/bin/arm-linux-gnueabihf-gcc)
 set(CMAKE_CXX_COMPILER  /usr/bin/arm-linux-gnueabihf-g++)

-set(CMAKE_FIND_ROOT_PATH  ${CMAKE_SYSROOT} )
+set(CMAKE_FIND_ROOT_PATH ${CMAKE_SYSROOT})
 set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
 set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

-set(ZYNQ_FLAGS  "-march=armv7-a -mthumb-interwork -mfloat-abi=hard -mfpu=neon -mtune=cortex-a7")
+set(ZYNQ_FLAGS
+    "-march=armv7-a -mthumb-interwork -mfloat-abi=hard -mfpu=neon -mtune=cortex-a7"
+)
 set(CMAKE_ASM_FLAGS ${ZYNQ_FLAGS} CACHE STRING "" FORCE)
 set(CMAKE_C_FLAGS   ${ZYNQ_FLAGS} CACHE STRING "" FORCE)
 set(CMAKE_CXX_FLAGS ${ZYNQ_FLAGS} CACHE STRING "" FORCE)

-set(CMAKE_LIBRARY_PATH ${CMAKE_SYSROOT}/usr/lib
-                       ${CMAKE_SYSROOT}/usr/lib/arm-linux-gnueabihf)
+set(CMAKE_LIBRARY_PATH
+    ${CMAKE_SYSROOT}/usr/lib
+    ${CMAKE_SYSROOT}/usr/lib/arm-linux-gnueabihf
+)

 set(CMAKE_INSTALL_PREFIX ${CMAKE_SYSROOT}/usr CACHE STRING "" FORCE)
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/CMakeParseArgumentsCopy.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/CMakeParseArgumentsCopy.cmake
@ -77,12 +77,12 @@ set(__CMAKE_PARSE_ARGUMENTS_INCLUDED TRUE)
 function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgNames)
  # first set all result variables to empty/FALSE
  foreach(arg_name ${_singleArgNames} ${_multiArgNames})
-    set(${prefix}_${arg_name})
-  endforeach(arg_name)
+      set(${prefix}_${arg_name})
+  endforeach()

  foreach(option ${_optionNames})
-    set(${prefix}_${option} FALSE)
-  endforeach(option)
+      set(${prefix}_${option} FALSE)
+  endforeach()

  set(${prefix}_UNPARSED_ARGUMENTS)

@ -103,9 +103,9 @@ function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgName
        elseif("${insideValues}" STREQUAL "MULTI")
          list(APPEND ${prefix}_${currentArgName} ${currentArg})
        endif()
-      else(insideValues)
+      else()
        list(APPEND ${prefix}_UNPARSED_ARGUMENTS ${currentArg})
-      endif(insideValues)
+      endif()
    else()
      if(NOT ${optionIndex} EQUAL -1)
        set(${prefix}_${currentArg} TRUE)
@ -121,12 +121,12 @@ function(CMAKE_PARSE_ARGUMENTS prefix _optionNames _singleArgNames _multiArgName
      endif()
    endif()

-  endforeach(currentArg)
+  endforeach()

  # propagate the result variables to the caller:
  foreach(arg_name ${_singleArgNames} ${_multiArgNames} ${_optionNames})
    set(${prefix}_${arg_name}  ${${prefix}_${arg_name}} PARENT_SCOPE)
-  endforeach(arg_name)
+  endforeach()
  set(${prefix}_UNPARSED_ARGUMENTS ${${prefix}_UNPARSED_ARGUMENTS} PARENT_SCOPE)

-endfunction(CMAKE_PARSE_ARGUMENTS _options _singleArgs _multiArgs)
+endfunction()
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/FindFILESYSTEM.cmake
@ -254,6 +254,9 @@ cmake_pop_check_state()

 set(FILESYSTEM_FOUND ${_found} CACHE BOOL "TRUE if we can compile and link a program using std::filesystem" FORCE)

+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(FILESYSTEM DEFAULT_MSG FILESYSTEM_FOUND)
+
 if(FILESYSTEM_FIND_REQUIRED AND NOT FILESYSTEM_FOUND)
    message(FATAL_ERROR "Cannot compile a simple program using std::filesystem")
 endif()
--- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
+++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
@ -34,7 +34,7 @@ macro(VOLK_PYTHON_CHECK_MODULE_RAW desc python_code have)
 endmacro()

 macro(VOLK_PYTHON_CHECK_MODULE desc mod cmd have)
-    VOLK_PYTHON_CHECK_MODULE_RAW(
+    volk_python_check_module_raw(
        "${desc}" "
 #########################################
 try: