Merge 78d2d4dbc8 into 3698814740

CMakeLists.txt

@@ -27,19 +27,12 @@ option(ENABLE_IP_SERVER   "Build tools providing CAN access via IP sockets" ON)
 option(ENABLE_GATEWAY     "Build in-kernel gateway configuration tools" ON)
 option(ENABLE_MEASUREMENT "Build measurement tools" ON)
 option(ENABLE_ISOTP       "Build isotp tools" ON)
+option(ENABLE_J1939       "Build J1939 tools" ON)
+option(ENABLE_ISOBUSFS    "Build ISOBUS tools" ON)
 option(ENABLE_LOG_FILE    "Build log file converter tools" ON)
 option(ENABLE_SLCAN       "Build slcan tools" ON)
 option(ENABLE_MCP251XFD   "Build MCP251XFD tools" ON)
 
-# cmake_dependent_option is only available in CMake 3.22 and later.
-if(ANDROID)
-  set(ENABLE_J1939    OFF)
-  set(ENABLE_ISOBUSFS OFF)
-else()
-  option(ENABLE_J1939    "Build J1939 tools"  ON)
-  option(ENABLE_ISOBUSFS "Build ISOBUS tools" ON)
-endif()
-
 find_package(PkgConfig REQUIRED)
 if(ENABLE_GPS)
   pkg_check_modules(GPS REQUIRED libgps)
@@ -67,13 +60,20 @@ include_directories(./include)
 
 check_function_exists(fork HAVE_FORK)
 
+if(NOT ANDROID)
+  # Not supported on Android.
+  set(ENABLE_J1939 OFF)
+  set(ENABLE_ISOBUSFS OFF)
+endif()
+
 # List of all programs to be built.
-# Each program is expected to have a corresponding source file with the same name.
 set(PROGRAMS)
 # List of programs to link against can.
 set(PROGRAMS_CANLIB)
 # List of programs to link against j1939 and can.
 set(PROGRAMS_J1939)
+# List of programs to link against isobusfs.
+set(PROGRAMS_ISOBUSFS)
 
 if(ENABLE_BASIC_TOOLS)
   list(APPEND PROGRAMS cansniffer)
@@ -97,15 +97,11 @@ endif()
 
 if(ENABLE_MEASUREMENT)
   list(APPEND PROGRAMS
+    can-calc-bit-timing
     canfdtest
     canerrsim
   )
   list(APPEND PROGRAMS_CANLIB canbusload)
-
-  add_executable(can-calc-bit-timing
-    calc-bit-timing/can-calc-bit-timing.c
-  )
-  install(TARGETS can-calc-bit-timing DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(ENABLE_ISOTP)
@@ -130,79 +126,19 @@ if(ENABLE_J1939)
     j1939spy
     j1939sr
     testj1939
+    j1939-timedate-srv
+    j1939-timedate-cli
   )
-
+  if(ENABLE_GPS)
-  add_executable(j1939-timedate-cli
+    list(APPEND PROGRAMS_J1939 j1939-vehicle-position-srv)
-    j1939_timedate/j1939_timedate_cli.c
+  endif()
-  )
-  target_link_libraries(j1939-timedate-cli
-    PRIVATE can j1939
-  )
-  install(TARGETS j1939-timedate-cli DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-  add_executable(j1939-timedate-srv
-    j1939_timedate/j1939_timedate_srv.c
-  )
-  target_link_libraries(j1939-timedate-srv
-    PRIVATE can j1939
-  )
-  install(TARGETS j1939-timedate-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
-endif()
-
-if(ENABLE_J1939 AND ENABLE_GPS)
-  add_executable(j1939-vehicle-position-srv
-    j1939_vehicle_position/j1939_vehicle_position_srv.c
-  )
-  target_link_libraries(j1939-vehicle-position-srv
-    PRIVATE can j1939 ${GPS_LIBRARIES}
-  )
-  install(TARGETS j1939-vehicle-position-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(ENABLE_ISOBUSFS)
-  add_library(isobusfs EXCLUDE_FROM_ALL
+  list(APPEND PROGRAMS_ISOBUSFS
-    isobusfs/isobusfs_cmn.c
+    isobusfs-srv
-    isobusfs/isobusfs_cmn_dh.c
+    isobusfs-cli
   )
-  set(PUBLIC_HEADER_ISOBUSFS
-    isobusfs/isobusfs_cmn.h
-    isobusfs/isobusfs_cmn_cm.h
-  )
-  set_target_properties(isobusfs PROPERTIES
-    PUBLIC_HEADER "${PUBLIC_HEADER_ISOBUSFS}"
-    SOVERSION 0
-  )
-  install(TARGETS isobusfs
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-  )
-
-  add_executable(isobusfs-cli
-    isobusfs/isobusfs_cli.c
-    isobusfs/isobusfs_cli_cm.c
-    isobusfs/isobusfs_cli_dh.c
-    isobusfs/isobusfs_cli_fa.c
-    isobusfs/isobusfs_cli_selftests.c
-    isobusfs/isobusfs_cli_int.c
-  )
-  target_link_libraries(isobusfs-cli
-    PRIVATE isobusfs can j1939
-  )
-  install(TARGETS isobusfs-cli DESTINATION ${CMAKE_INSTALL_BINDIR})
-
-  add_executable(isobusfs-srv
-    isobusfs/isobusfs_srv.c
-    isobusfs/isobusfs_srv_cm.c
-    isobusfs/isobusfs_srv_cm_fss.c
-    isobusfs/isobusfs_srv_dh.c
-    isobusfs/isobusfs_srv_fa.c
-    isobusfs/isobusfs_srv_fh.c
-    isobusfs/isobusfs_srv_vh.c
-  )
-  target_link_libraries(isobusfs-srv
-    PRIVATE isobusfs can j1939
-  )
-  install(TARGETS isobusfs-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
 if(ENABLE_LOG_FILE)
@@ -222,6 +158,58 @@ if(ENABLE_SLCAN)
 endif()
 
 if(ENABLE_MCP251XFD)
+  list(APPEND PROGRAMS mcp251xfd-dump)
+endif()
+
+list(APPEND PROGRAMS
+  ${PROGRAMS_CANLIB}
+  ${PROGRAMS_J1939}
+  ${PROGRAMS_ISOBUSFS}
+)
+
+add_library(can STATIC EXCLUDE_FROM_ALL
+  lib.c
+  canframelen.c
+)
+
+if(ENABLE_J1939)
+  add_library(j1939 STATIC EXCLUDE_FROM_ALL
+    libj1939.c
+  )
+  target_link_libraries(j1939
+    PRIVATE can
+  )
+endif()
+
+if(ENABLE_ISOBUSFS)
+  add_library(isobusfs EXCLUDE_FROM_ALL
+    isobusfs/isobusfs_cmn.c
+    isobusfs/isobusfs_cmn_dh.c
+  )
+  set(PUBLIC_HEADER_ISOBUSFS
+    isobusfs/isobusfs_cmn.h
+    isobusfs/isobusfs_cmn_cm.h
+  )
+  set_target_properties(isobusfs PROPERTIES
+    PUBLIC_HEADER "${PUBLIC_HEADER_ISOBUSFS}"
+    SOVERSION 0
+  )
+  install(TARGETS isobusfs
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+  )
+endif()
+
+if(can-calc-bit-timing IN_LIST PROGRAMS)
+  list(REMOVE_ITEM PROGRAMS can-calc-bit-timing)
+  add_executable(can-calc-bit-timing
+    calc-bit-timing/can-calc-bit-timing.c
+  )
+  install(TARGETS can-calc-bit-timing DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+if(mcp251xfd-dump IN_LIST PROGRAMS)
+  list(REMOVE_ITEM PROGRAMS mcp251xfd-dump)
   add_executable(mcp251xfd-dump
     mcp251xfd/mcp251xfd-dev-coredump.c
     mcp251xfd/mcp251xfd-dump.c
@@ -231,22 +219,70 @@ if(ENABLE_MCP251XFD)
   install(TARGETS mcp251xfd-dump DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
 
-list(APPEND PROGRAMS
+if(isobusfs-cli IN_LIST PROGRAMS)
-  ${PROGRAMS_CANLIB}
+  list(REMOVE_ITEM PROGRAMS isobusfs-cli)
-  ${PROGRAMS_J1939}
+  add_executable(isobusfs-cli
-)
+    isobusfs/isobusfs_cli.c
+    isobusfs/isobusfs_cli_cm.c
+    isobusfs/isobusfs_cli_dh.c
+    isobusfs/isobusfs_cli_fa.c
+    isobusfs/isobusfs_cli_selftests.c
+    isobusfs/isobusfs_cli_int.c
+  )
+  target_link_libraries(isobusfs-cli
+    PRIVATE isobusfs can j1939
+  )
+  install(TARGETS isobusfs-cli DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
-add_library(can STATIC EXCLUDE_FROM_ALL
+if(isobusfs-srv IN_LIST PROGRAMS)
-  lib.c
+  list(REMOVE_ITEM PROGRAMS isobusfs-srv)
-  canframelen.c
+  add_executable(isobusfs-srv
-)
+    isobusfs/isobusfs_srv.c
+    isobusfs/isobusfs_srv_cm.c
+    isobusfs/isobusfs_srv_cm_fss.c
+    isobusfs/isobusfs_srv_dh.c
+    isobusfs/isobusfs_srv_fa.c
+    isobusfs/isobusfs_srv_fh.c
+    isobusfs/isobusfs_srv_vh.c
+  )
+  target_link_libraries(isobusfs-srv
+    PRIVATE isobusfs can j1939
+  )
+  install(TARGETS isobusfs-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
-add_library(j1939 STATIC EXCLUDE_FROM_ALL
+if(j1939-timedate-cli IN_LIST PROGRAMS)
-  libj1939.c
+  list(REMOVE_ITEM PROGRAMS j1939-timedate-cli)
-)
+  add_executable(j1939-timedate-cli
-target_link_libraries(j1939
+    j1939_timedate/j1939_timedate_cli.c
-  PRIVATE can
+  )
-)
+  target_link_libraries(j1939-timedate-cli
+    PRIVATE can j1939
+  )
+  install(TARGETS j1939-timedate-cli DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+if(j1939-timedate-srv IN_LIST PROGRAMS)
+  add_executable(j1939-timedate-srv
+    j1939_timedate/j1939_timedate_srv.c
+  )
+  target_link_libraries(j1939-timedate-srv
+    PRIVATE can j1939
+  )
+  install(TARGETS j1939-timedate-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
+
+if(j1939-vehicle-position-srv IN_LIST PROGRAMS)
+  list(REMOVE_ITEM PROGRAMS j1939-vehicle-position-srv)
+  add_executable(j1939-vehicle-position-srv
+    j1939_vehicle_position/j1939_vehicle_position_srv.c
+  )
+  target_link_libraries(j1939-vehicle-position-srv
+    PRIVATE can j1939 ${GPS_LIBRARIES}
+  )
+  install(TARGETS j1939-vehicle-position-srv DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
 foreach(name ${PROGRAMS})
   add_executable(${name} ${name}.c)
@@ -259,6 +295,10 @@ foreach(name ${PROGRAMS})
     target_link_libraries(${name}
       PRIVATE can
     )
+  elseif("${name}" IN_LIST PROGRAMS_ISOBUSFS)
+    target_link_libraries(${name}
+      PRIVATE isobusfs can j1939
+    )
   endif()
 
   install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR})