commit
f12a59d780
|
|
@ -127,8 +127,7 @@ if(NOT ANDROID)
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(isobusfs-cli
|
target_link_libraries(isobusfs-cli
|
||||||
PRIVATE isobusfs
|
PRIVATE isobusfs can
|
||||||
PRIVATE can
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_executable(isobusfs-srv
|
add_executable(isobusfs-srv
|
||||||
|
|
@ -142,8 +141,7 @@ if(NOT ANDROID)
|
||||||
)
|
)
|
||||||
|
|
||||||
target_link_libraries(isobusfs-srv
|
target_link_libraries(isobusfs-srv
|
||||||
PRIVATE isobusfs
|
PRIVATE isobusfs can
|
||||||
PRIVATE can
|
|
||||||
)
|
)
|
||||||
|
|
||||||
install(TARGETS
|
install(TARGETS
|
||||||
|
|
@ -173,6 +171,13 @@ foreach(name ${PROGRAMS})
|
||||||
install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})
|
||||||
endforeach()
|
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"
|
||||||
|
)
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,8 @@
|
||||||
|
|
||||||
if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt")
|
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()
|
endif()
|
||||||
|
|
||||||
file(READ "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt" files)
|
file(READ "${CMAKE_CURRENT_BINARY_DIR}/install_manifest.txt" files)
|
||||||
|
|
@ -11,7 +13,10 @@ foreach(file ${files})
|
||||||
if(EXISTS "${file}")
|
if(EXISTS "${file}")
|
||||||
file(REMOVE ${file})
|
file(REMOVE ${file})
|
||||||
if (EXISTS "${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()
|
endif()
|
||||||
else()
|
else()
|
||||||
message(STATUS "File ${file} does not exist.")
|
message(STATUS "File ${file} does not exist.")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue