CMakeLists.txt, main: removed USE_DEVICE_ARG usage. Now --device/-d is always available
This commit is contained in:
parent
4687fe3467
commit
09838fa825
|
|
@ -675,10 +675,6 @@ if (ENABLE_UDEV)
|
||||||
target_link_libraries(openFPGALoader ${LIBUDEV_LIBRARIES})
|
target_link_libraries(openFPGALoader ${LIBUDEV_LIBRARIES})
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if (ENABLE_UDEV OR ENABLE_LIBGPIOD OR ENABLE_JETSONNANOGPIO)
|
|
||||||
add_definitions(-DUSE_DEVICE_ARG)
|
|
||||||
endif(ENABLE_UDEV OR ENABLE_LIBGPIOD OR ENABLE_JETSONNANOGPIO)
|
|
||||||
|
|
||||||
if (BUILD_STATIC)
|
if (BUILD_STATIC)
|
||||||
set_target_properties(openFPGALoader PROPERTIES LINK_SEARCH_END_STATIC 1)
|
set_target_properties(openFPGALoader PROPERTIES LINK_SEARCH_END_STATIC 1)
|
||||||
endif()
|
endif()
|
||||||
|
|
|
||||||
|
|
@ -931,10 +931,8 @@ int parse_opt(int argc, char **argv, struct arguments *args,
|
||||||
("ftdi-channel",
|
("ftdi-channel",
|
||||||
"FTDI chip channel number (channels 0-3 map to A-D)",
|
"FTDI chip channel number (channels 0-3 map to A-D)",
|
||||||
cxxopts::value<int>(args->ftdi_channel))
|
cxxopts::value<int>(args->ftdi_channel))
|
||||||
#if defined(USE_DEVICE_ARG)
|
|
||||||
("d,device", "device to use (/dev/ttyUSBx)",
|
("d,device", "device to use (/dev/ttyUSBx)",
|
||||||
cxxopts::value<std::string>(args->device))
|
cxxopts::value<std::string>(args->device))
|
||||||
#endif
|
|
||||||
("detect", "detect FPGA, add -f to show connected flash",
|
("detect", "detect FPGA, add -f to show connected flash",
|
||||||
cxxopts::value<bool>(args->detect))
|
cxxopts::value<bool>(args->detect))
|
||||||
("dfu", "DFU mode", cxxopts::value<bool>(args->dfu))
|
("dfu", "DFU mode", cxxopts::value<bool>(args->dfu))
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue