Fix CMake issues #737
Fix CMake issues #737
Conversation
ikspress
force-pushed
the
packaging
branch
2 times, most recently
from
e5bb5ff
to
e558853
Compare
There was a problem hiding this comment.
I appreciate the effort. Feel free to ignore my comments and proceed with a merge. Since I am currently away from computers where I can test the changes, I kindly ask for other reviewers to give green light.
Generally speaking: The changes point into the right direction. Making libnfc's CMake system truly platform independent is still some work to be done. I currently take a third deep dive into Craig Scott's book which got some chapters added about release and dependency management. You might find these helpful.
| ENDIF(LIBUSB_INCLUDE_DIRS AND LIBUSB_LIBRARIES) | ||
| FIND_PATH(LIBUSB_INCLUDE_DIRS NAMES usb.h lusb0_usb.h) | ||
| FIND_LIBRARY(LIBUSB_LIBRARIES NAMES libusb libusb0) | ||
| GET_FILENAME_COMPONENT(LIBUSB_LIBRARY_DIRS ${LIBUSB_LIBRARIES} PATH CACHE) | ||
| ENDIF(NOT LIBUSB_FOUND) |
There was a problem hiding this comment.
How about using ExternalProject_Add for libusb when everything else fails?
There was a problem hiding this comment.
Oh, okay, I will make changes for your suggestion.
There was a problem hiding this comment.
Oh, libnfc uses libusb-0.1 rather than libusb-1.0. libusb-win32, a Windows library for libusb-0.1 api, is easy to compile, so I will just make it for Windows.
Co-authored-by: Markus Werle <daixtrose@users.noreply.github.com>
Based on #735.
The propose of this PR is as follows.
LibNFCConfig.cmakerelocatable.GNUInstallDirsto simplify code.BUILD_MANUALandINSTALL_BUNDLEfor user discretion.zipas the CPack default generator (let others usecpack -G "xxxx").FindLIBUSB.cmake.The reason why I changed
UTILS-SOURCESandEXAMPLES-SOURCEStoSOURCESis that I was going to fixFixBundle.cmake.inbut it failed serveral times and finally I gave up. :(ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}is unneeded which is built-in default.