diff --git a/CMakeLists.txt b/CMakeLists.txt index a85f0ff..9efd19c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,27 +165,27 @@ if(LIBICSNEO_ENABLE_FTD3XX) if(NOT FTD3XX_ROOT) # allow system override include(FetchContent) if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.3.0.4-win-x64.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=7ba81100e0d4e96aca685545656c9dfa393d08587b94319551f75a6089f04b5e") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.3.0.4-win-x64.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=ee1289cdd5023de67275aaa1712e8e32e73e825a8392efb0a76f161e357fbdc9") elseif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.3.0.4-win-i686.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=e290bc29ee5b1a9e779225f276f7956debe7326019e066f077c46d9242beab4b") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.3.0.4-win-i686.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=bcd31f5c3cb39ecb9b09db5ce722bd79de6e0f813130e7b8f2c86879a60d8ff0") elseif(APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.0.5-macos-universal2.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=a540583f3c1e80c6ebbc27a28a4168820f8b11b78752d0655f0bfe40e723129d") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.0.14-macos-universal2.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=74c0d35f04242d0841532c6325eb2932b8f627e3c395382a15d9f39974d27a90") elseif(UNIX) if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|amd64|AMD64") if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.0.5-linux-x64.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=e9a16a41f407ee2932fcf77468204b0009468b5c15f5441e3b1302ccfd4144af") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.0.14-linux-x64.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=a9dc7eb6948c8977fbd79f6700bec6f882d3da5667aea8f2175b8d1f6f08e456") endif() elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "arm.*|aarch64") if(CMAKE_SIZEOF_VOID_P EQUAL 8) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.0.5-linux-aarch64.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=f06baabe5ed32f95470bb85bb84fb2d0a256b5e33c9bda753ee438877feb0361") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.0.14-linux-aarch64.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=da4b90ea1cbb905874cd159ad2ab8c1bdde65cc22b3aa55bf2b5fd85ca6efd22") elseif(CMAKE_SIZEOF_VOID_P EQUAL 4) - set(LIBICSNEO_FTD3XX_URL "https://cdn.intrepidcs.net/support/libicsneo/libftd3xx/libftd3xx-1.0.5-linux-armhf.zip") - set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=049308085cdb89bb67458be4815b6107c7996e723e16253aec46c2de7df1c570") + set(LIBICSNEO_FTD3XX_URL "https://github.com/intrepidcs/libftd3xx-repack/releases/download/23.28.0/libftd3xx-1.0.14-linux-armhf.zip") + set(LIBICSNEO_FTD3XX_URL_HASH "SHA256=d813008117422cae958f7c71a065cdac0d31dca3b24809d3ab5e13604a9c3fb1") endif() endif() endif() @@ -400,10 +400,6 @@ if(LIBICSNEO_ENABLE_RAW_ETHERNET) endif(WIN32) endif(LIBICSNEO_ENABLE_RAW_ETHERNET) -if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - target_link_libraries(icsneocpp PUBLIC "-framework CoreFoundation" "-framework IOKit") -endif() - if(LIBICSNEO_BUILD_ICSNEOC) add_library(icsneoc SHARED api/icsneoc/icsneoc.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated/icsneoc/version.rc) target_include_directories(icsneoc diff --git a/third-party/libftdi/cmake/FindUSB1.cmake b/third-party/libftdi/cmake/FindUSB1.cmake index b90e297..95119e6 100644 --- a/third-party/libftdi/cmake/FindUSB1.cmake +++ b/third-party/libftdi/cmake/FindUSB1.cmake @@ -26,9 +26,15 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES) PATH_SUFFIXES libusb-1.0 PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS}) - FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0 + FIND_LIBRARY(LIBUSB_LIBRARY NAMES usb-1.0 PATHS ${PC_LIBUSB_LIBDIR} ${PC_LIBUSB_LIBRARY_DIRS}) + if (APPLE) + set(LIBUSB_LIBRARIES "${LIBUSB_LIBRARY};-lobjc;-Wl,-framework,IOKit;-Wl,-framework,CoreFoundation;-Wl,-framework,Security") + else() + set(LIBUSB_LIBRARIES "${LIBUSB_LIBRARY}") + endif (APPLE) + include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(LIBUSB DEFAULT_MSG LIBUSB_LIBRARIES LIBUSB_INCLUDE_DIR)