diff --git a/CMakeLists.txt b/CMakeLists.txt index c29ef54..652cd35 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 3.3) project(can-utils LANGUAGES C) +include (GNUInstallDirs) + if(NOT CMAKE_BUILD_TYPE) set(CMAKE_BUILD_TYPE Release) endif() @@ -20,20 +22,42 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DN_SLCAN=17") include_directories (.) include_directories (./include) -set(PROGRAMS_ISOTP isotpdump isotprecv isotpsend isotpsniffer - isotptun isotpserver isotpperf) -set(PROGRAMS_CANGW cangw) -set(PROGRAMS_SLCAN slcan_attach slcand) -set(PROGRAMS_J1939 jacd jspy jsr testj1939) -set(PROGRAMS_CANLIB cansend cangen candump canplayer canlogserver - canbusload log2long log2asc asc2log) +set(PROGRAMS_CANLIB + asc2log + canbusload + candump + cangen + canlogserver + canplayer + cansend + log2asc + log2long +) -set(PROGRAMS can-calc-bit-timing cansniffer bcmserver - ${PROGRAMS_CANLIB} - ${PROGRAMS_ISOTP} - ${PROGRAMS_CANGW} - ${PROGRAMS_SLCAN} - slcanpty canfdtest +set(PROGRAMS_J1939 + jacd + jspy + jsr + testj1939 +) + +set(PROGRAMS + ${PROGRAMS_CANLIB} + bcmserver + can-calc-bit-timing + canfdtest + cangw + cansniffer + isotpdump + isotpperf + isotprecv + isotpsend + isotpserver + isotpsniffer + isotptun + slcan_attach + slcand + slcanpty ) if(NOT ANDROID) @@ -51,7 +75,7 @@ foreach(name ${PROGRAMS}) endif() add_executable(${name} ${name}.c ${SRC_DEPS}) - install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS ${name} DESTINATION ${CMAKE_INSTALL_BINDIR}) endforeach()