luke/openFPGALoader
1
0
Fork 0
mirror of https://github.com/trabucayre/openFPGALoader.git synced 2026-08-22 14:17:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #328 from chenzhuoyu/fix/cmakelists

Browse Source 
Fix `cmsisdap` support on macOS
This commit is contained in:
Gwenhael Goavec-Merou
2023-04-10 09:10:07 +02:00
committed by GitHub
parent d5389730e7 af11d08989
commit 9e65ebb821
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
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/
CMakeLists.txt
+11 -1
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}
@@ -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)