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

CMakeLists: fix general code styling, use dynamic linking on macOS 

* Making the indentation even across the whole file
* Use dynamic linking on macOS and fix its pkg-config usage in the
process. This should render openFPGALoader agnostic to the
location of Homebrew's prefix, and solve compatibility issues with
MacPorts
This commit is contained in:
Jean THOMAS 2022-03-22 21:36:36 +01:00
parent 7d730eeeb6
commit c2b85f2a47
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
CMakeLists.txt
View File

@ -1,4 +1,3 @@
cmake_minimum_required(VERSION 3.0) cmake_minimum_required(VERSION 3.0)
# set the project name # set the project name
@ -7,9 +6,9 @@ add_definitions(-DVERSION=\"v${PROJECT_VERSION}\")
option(BUILD_STATIC "Whether or not to build with static libraries" OFF) option(BUILD_STATIC "Whether or not to build with static libraries" OFF)
if (${CMAKE_SYSTEM_NAME} MATCHES "Windows") if (${CMAKE_SYSTEM_NAME} MATCHES "Windows")
set(ENABLE_UDEV OFF) set(ENABLE_UDEV OFF)
else() else()
option(ENABLE_UDEV "use udev to search JTAG adapter from /dev/xx" ON) option(ENABLE_UDEV "use udev to search JTAG adapter from /dev/xx" ON)
endif() endif()
option(ENABLE_CMSISDAP "enable cmsis DAP interface (requires hidapi)" ON) option(ENABLE_CMSISDAP "enable cmsis DAP interface (requires hidapi)" ON)
option(USE_PKGCONFIG "Use pkgconfig to find libraries" ON) option(USE_PKGCONFIG "Use pkgconfig to find libraries" ON)
@ -32,13 +31,13 @@ add_definitions(-DDATA_DIR=\"${CMAKE_INSTALL_FULL_DATAROOTDIR}\")
add_definitions(-DISE_DIR=\"${ISE_PATH}\") add_definitions(-DISE_DIR=\"${ISE_PATH}\")
if(USE_PKGCONFIG) if (USE_PKGCONFIG)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(LIBFTDI REQUIRED libftdi1) pkg_check_modules(LIBFTDI REQUIRED libftdi1)
pkg_check_modules(LIBUSB REQUIRED libusb-1.0) pkg_check_modules(LIBUSB REQUIRED libusb-1.0)
pkg_check_modules(HIDAPI hidapi-hidraw) pkg_check_modules(HIDAPI hidapi-hidraw)
# if hidraw not found try with libusb # if hidraw not found try with libusb
if(NOT HIDAPI_FOUND) if (NOT HIDAPI_FOUND)
pkg_check_modules(HIDAPI hidapi-libusb) pkg_check_modules(HIDAPI hidapi-libusb)
endif() endif()
# zlib support (gzip) # zlib support (gzip)
@ -53,7 +52,7 @@ if(USE_PKGCONFIG)
endif() endif()
endif(NOT ZLIB_FOUND) endif(NOT ZLIB_FOUND)
if(ENABLE_UDEV) if (ENABLE_UDEV)
pkg_check_modules(LIBUDEV libudev) pkg_check_modules(LIBUDEV libudev)
if (LIBUDEV_FOUND) if (LIBUDEV_FOUND)
add_definitions(-DUSE_UDEV) add_definitions(-DUSE_UDEV)
@ -159,6 +158,11 @@ set(OPENFPGALOADER_HEADERS
src/colognechipCfgParser.hpp src/colognechipCfgParser.hpp
) )
link_directories(
${LIBUSB_LIBRARY_DIRS}
${LIBFTDI_LIBRARY_DIRS}
)
add_executable(openFPGALoader add_executable(openFPGALoader
${OPENFPGALOADER_SOURCE} ${OPENFPGALOADER_SOURCE}
${OPENFPGALOADER_HEADERS} ${OPENFPGALOADER_HEADERS}
@ -169,16 +173,6 @@ include_directories(
${LIBFTDI_INCLUDE_DIRS} ${LIBFTDI_INCLUDE_DIRS}
) )
if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
find_library(LIBFTDI1STATIC libftdi1.a REQUIRED)
find_library(LIBUSB1STATIC libusb-1.0.a REQUIRED)
target_link_libraries(openFPGALoader ${LIBFTDI1STATIC} ${LIBUSB1STATIC})
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -framework CoreFoundation -framework IOKit -framework Security")
link_directories(/usr/local/lib)
target_include_directories(openFPGALoader PRIVATE /usr/local/include)
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
set_target_properties(openFPGALoader PROPERTIES LINK_SEARCH_END_STATIC 1)
else()
target_link_libraries(openFPGALoader target_link_libraries(openFPGALoader
${LIBUSB_LIBRARIES} ${LIBUSB_LIBRARIES}
${LIBFTDI_LIBRARIES} ${LIBFTDI_LIBRARIES}
@ -194,9 +188,9 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
add_definitions(-DATTACH_KERNEL) add_definitions(-DATTACH_KERNEL)
endif() endif()
if(ENABLE_UDEV) if (ENABLE_UDEV)
include_directories(${LIBUDEV_INCLUDE_DIRS}) include_directories(${LIBUDEV_INCLUDE_DIRS})
target_link_libraries(openFPGALoader ${LIBUDEV_LIBRARIES}) target_link_libraries(openFPGALoader ${LIBUDEV_LIBRARIES})
endif() endif()
if (BUILD_STATIC) if (BUILD_STATIC)
@ -204,16 +198,16 @@ if (BUILD_STATIC)
endif() endif()
if (ENABLE_CMSISDAP) if (ENABLE_CMSISDAP)
if (HIDAPI_FOUND) if (HIDAPI_FOUND)
include_directories(${HIDAPI_INCLUDE_DIRS}) include_directories(${HIDAPI_INCLUDE_DIRS})
target_link_libraries(openFPGALoader ${HIDAPI_LIBRARIES}) target_link_libraries(openFPGALoader ${HIDAPI_LIBRARIES})
add_definitions(-DENABLE_CMSISDAP=1) add_definitions(-DENABLE_CMSISDAP=1)
target_sources(openFPGALoader PRIVATE src/cmsisDAP.cpp) target_sources(openFPGALoader PRIVATE src/cmsisDAP.cpp)
list (APPEND OPENFPGALOADER_HEADERS src/cmsisDAP.hpp) list (APPEND OPENFPGALOADER_HEADERS src/cmsisDAP.hpp)
message("cmsis_dap support enabled") message("cmsis_dap support enabled")
else() else()
message("hidapi-libusb not found: cmsis_dap support disabled") message("hidapi-libusb not found: cmsis_dap support disabled")
endif() endif()
endif(ENABLE_CMSISDAP) endif(ENABLE_CMSISDAP)
if (ZLIB_FOUND) if (ZLIB_FOUND)
@ -223,7 +217,6 @@ if (ZLIB_FOUND)
else() else()
message("zlib library not found: can't flash intel/altera devices") message("zlib library not found: can't flash intel/altera devices")
endif() endif()
endif()
if (LINK_CMAKE_THREADS) if (LINK_CMAKE_THREADS)
find_package(Threads REQUIRED) find_package(Threads REQUIRED)