Fix formatting errors detected by cmakelint

This commit is contained in:
Carles Fernandez 2020-03-01 11:53:01 +01:00
parent ae26f63140
commit e638019d93
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
7 changed files with 17 additions and 17 deletions

View File

@ -925,7 +925,7 @@ if(NOT VOLKGNSSSDR_FOUND)
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr
BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/volk_gnsssdr_module/build
CMAKE_ARGS ${VOLK_GNSSSDR_CMAKE_ARGS}
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
-DCMAKE_BUILD_TYPE=$<$<CONFIG:None>:None>$<$<CONFIG:Debug>:Debug>$<$<CONFIG:Release>:Release>$<$<CONFIG:RelWithDebInfo>:RelWithDebInfo>$<$<CONFIG:MinSizeRel>:MinSizeRel>$<$<CONFIG:NoOptWithASM>:NoOptWithASM>$<$<CONFIG:Coverage>:Coverage>$<$<CONFIG:O2WithASM>:O2WithASM>$<$<CONFIG:O3WithASM>:O3WithASM>$<$<CONFIG:ASAN>:ASAN>
DOWNLOAD_COMMAND ""
UPDATE_COMMAND ""
PATCH_COMMAND ""

View File

@ -29,7 +29,7 @@ endif()
if(HAVE_POSIX_MEMALIGN)
message(STATUS "Use `posix_memalign` for aligned malloc!")
add_definitions(-DHAVE_POSIX_MEMALIGN)
endif(HAVE_POSIX_MEMALIGN)
endif()
# MAKE volk_gnsssdr_profile
add_executable(volk_gnsssdr_profile
@ -42,7 +42,7 @@ if(MSVC)
target_include_directories(volk_gnsssdr_profile
PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/cmake/msvc>
)
endif(MSVC)
endif()
target_include_directories(volk_gnsssdr_profile
PRIVATE $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>

View File

@ -309,7 +309,7 @@ if(NOT CROSSCOMPILE_MULTILIB AND CPU_IS_x86)
if(${SIZEOF_CPU} EQUAL 64 AND MSVC)
overrule_arch(mmx "No MMX for Win64")
if(MSVC_VERSION GREATER 1700)
OVERRULE_ARCH(sse "No SSE for Win64 Visual Studio 2013")
overrule_arch(sse "No SSE for Win64 Visual Studio 2013")
endif()
endif()

View File

@ -12,7 +12,7 @@
########################################################################
include(VolkPython)
VOLK_PYTHON_INSTALL(
volk_python_install(
FILES
__init__.py
cfg.py
@ -21,7 +21,7 @@ VOLK_PYTHON_INSTALL(
COMPONENT "volk_gnsssdr"
)
VOLK_PYTHON_INSTALL(
volk_python_install(
PROGRAMS
volk_gnsssdr_modtool
DESTINATION ${VOLK_RUNTIME_DIR}

View File

@ -35,7 +35,7 @@ target_link_libraries(resampler_gr_blocks
Gnuradio::runtime
Boost::headers # Fix for homebrew
PRIVATE
Volk::volk
Volk::volk
)
if(ENABLE_CLANG_TIDY)

View File

@ -24,10 +24,10 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
set_property(TARGET obsdiff PROPERTY CXX_STANDARD 14) # Required by GPSTk v3.0.0
# Do not show warnings raised by GPSTk v3.0.0
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(obsdiff
PUBLIC
-Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder -Wno-deprecated-copy -Wno-extra -Wno-unused-but-set-variable -Wno-unknown-pragmas
)
target_compile_options(obsdiff
PUBLIC
-Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-reorder -Wno-deprecated-copy -Wno-extra -Wno-unused-but-set-variable -Wno-unknown-pragmas
)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(obsdiff
@ -65,8 +65,8 @@ if("${ARMADILLO_VERSION_STRING}" VERSION_GREATER "9.800" OR (NOT ARMADILLO_FOUND
)
add_custom_command(TARGET obsdiff POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:obsdiff>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:obsdiff>
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:obsdiff>
${CMAKE_SOURCE_DIR}/install/$<TARGET_FILE_NAME:obsdiff>
)
install(TARGETS obsdiff

View File

@ -50,10 +50,10 @@ if(Boost_FOUND)
set_property(TARGET rinex2assist PROPERTY CXX_STANDARD 14) # Required by GPSTk
# Do not show warnings raised by GPSTk v3.0.0
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
target_compile_options(rinex2assist
PUBLIC
-Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-variable -Wno-deprecated-copy -Wno-extra
)
target_compile_options(rinex2assist
PUBLIC
-Wno-deprecated -Wno-unused-parameter -Wno-sign-compare -Wno-type-limits -Wno-unused-but-set-variable -Wno-deprecated-copy -Wno-extra
)
endif()
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
target_compile_options(rinex2assist