Merge pull request #534 from yegorich/cmake-format

CMake: resolve linting issues
pull/537/head
Marc Kleine-Budde 2024-05-27 12:26:59 +02:00 committed by GitHub
commit f12a59d780
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 77 additions and 67 deletions

View File

@ -127,8 +127,7 @@ if(NOT ANDROID)
)
target_link_libraries(isobusfs-cli
PRIVATE isobusfs
PRIVATE can
PRIVATE isobusfs can
)
add_executable(isobusfs-srv
@ -142,8 +141,7 @@ if(NOT ANDROID)
)
target_link_libraries(isobusfs-srv
PRIVATE isobusfs
PRIVATE can
PRIVATE isobusfs can
)
install(TARGETS
@ -173,6 +171,13 @@ foreach(name ${PROGRAMS})
install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
endforeach()
install(TARGETS can-calc-bit-timing mcp251xfd-dump DESTINATION ${CMAKE_INSTALL_BINDIR})
install(TARGETS
can-calc-bit-timing
mcp251xfd-dump
DESTINATION ${CMAKE_INSTALL_BINDIR}
)
ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/cmake/make_uninstall.cmake")
add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_SOURCE_DIR}/cmake/make_uninstall.cmake"
COMMENT "Add uninstall target"
)

View File

@ -1,6 +1,8 @@
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")
message(FATAL_ERROR "Cannot find install manifest: ${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")
message(FATAL_ERROR
"Cannot find install manifest: \
${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt"
)
endif()
file(READ "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt" files)
@ -11,7 +13,10 @@ foreach(file ${files})
if(EXISTS "${file}")
file(REMOVE ${file})
if (EXISTS "${file}")
message(FATAL_ERROR "Problem when removing ${file}, please check your permissions")
message(
FATAL_ERROR "Problem when removing ${file}, \
please check your permissions"
)
endif()
else()
message(STATUS "File ${file} does not exist.")