luke
/
openFPGALoader
mirror of https://github.com/trabucayre/openFPGALoader.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: fix `cmsisdap` support for macOS

This commit is contained in:
chenzhuoyu 2023-04-09 14:06:16 +08:00
parent d5389730e7
commit af11d08989
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -45,3 +45,6 @@ build/
/doc/compatibility/boards.inc /doc/compatibility/boards.inc
/doc/compatibility/cable.inc /doc/compatibility/cable.inc
/doc/compatibility/fpga.inc /doc/compatibility/fpga.inc
# VSCode local settings directory
/.vscode/

18
CMakeLists.txt
View File

@ -53,6 +53,9 @@ if (USE_PKGCONFIG)
if (NOT HIDAPI_FOUND) if (NOT HIDAPI_FOUND)
pkg_check_modules(HIDAPI hidapi-libusb) pkg_check_modules(HIDAPI hidapi-libusb)
endif() endif()
if (NOT HIDAPI_FOUND)
pkg_check_modules(HIDAPI hidapi)
endif()
# zlib support (gzip) # zlib support (gzip)
pkg_check_modules(ZLIB zlib) pkg_check_modules(ZLIB zlib)
if (NOT ZLIB_FOUND) if (NOT ZLIB_FOUND)
@ -188,6 +191,14 @@ link_directories(
${LIBFTDI_LIBRARY_DIRS} ${LIBFTDI_LIBRARY_DIRS}
) )
if (ENABLE_LIBGPIOD)
link_directories(${LIBGPIOD_LIBRARY_DIRS})
endif()
if (ENABLE_CMSISDAP AND HIDAPI_FOUND)
link_directories(${HIDAPI_LIBRARY_DIRS})
endif()
add_executable(openFPGALoader add_executable(openFPGALoader
${OPENFPGALOADER_SOURCE} ${OPENFPGALOADER_SOURCE}
${OPENFPGALOADER_HEADERS} ${OPENFPGALOADER_HEADERS}
@ -206,8 +217,8 @@ target_link_libraries(openFPGALoader
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
# winsock provides ntohs # winsock provides ntohs
target_link_libraries(openFPGALoader ws2_32) target_link_libraries(openFPGALoader ws2_32)
target_sources(openFPGALoader PRIVATE src/pathHelper.cpp) target_sources(openFPGALoader PRIVATE src/pathHelper.cpp)
list(APPEND OPENFPGALOADER_HEADERS src/pathHelper.hpp) list(APPEND OPENFPGALOADER_HEADERS src/pathHelper.hpp)
endif() endif()
@ -222,7 +233,6 @@ if (ENABLE_UDEV)
endif() endif()
if (ENABLE_LIBGPIOD) if (ENABLE_LIBGPIOD)
link_directories(${LIBGPIOD_LIBRARY_DIRS})
include_directories(${LIBGPIOD_INCLUDE_DIRS}) include_directories(${LIBGPIOD_INCLUDE_DIRS})
target_link_libraries(openFPGALoader ${LIBGPIOD_LIBRARIES}) target_link_libraries(openFPGALoader ${LIBGPIOD_LIBRARIES})
add_definitions(-DENABLE_LIBGPIOD=1) add_definitions(-DENABLE_LIBGPIOD=1)
@ -337,7 +347,7 @@ else()
) )
endif() endif()
install(FILES install(FILES
${GZ_FILES} ${GZ_FILES}
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/openFPGALoader DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/openFPGALoader
) )