Fix build with CMake #58
Conversation
There was a problem hiding this comment.
This has some suspect aspects I summed-up in this comment in issue #57.
cmake/config_posix.h.cmake
Outdated
|
|
||
| /* to get htobe16, le16toh, etc */ | ||
| #define _BSD_SOURCE | ||
| #include <endian.h> |
There was a problem hiding this comment.
Unfortunately, this fails on my computer (running FreeBSD):
nfc-tools/libfreefare/build % make
Scanning dependencies of target freefare
[ 2%] Building C object libfreefare/CMakeFiles/freefare.dir/felica.c.o
In file included from /home/romain/Projects/nfc-tools/libfreefare/libfreefare/felica.c:28:
/home/romain/Projects/nfc-tools/libfreefare/config.h:9:10: fatal error: 'endian.h' file not found
#include <endian.h>
^~~~~~~~~~
1 error generated.
*** Error code 1
I guess it will fail on Mac OS too… Can't we detect sys/endian.h, endian.h, CoreFoundation/CoreFoundation.h and byteswap.h and define HAVE_SYS_ENDIAN_H, HAVE_ENDIAN_H, HAVE_COREFOUNDATION_COREFOUNDATION_H and HAVE_BYTESWAP_H accordingly?
CMakeLists.txt
Outdated
| @@ -13,8 +13,13 @@ IF(WIN32) | |||
| include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32) | |||
| find_library(WINSOCK_LIB libws2_32.a) | |||
| set(LIBS ${LIBS} ${WINSOCK_LIB}) | |||
| ELSE(WIN32) | |||
| set(_XOPEN_SOURCE 600) | |||
| configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_posix.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h) | |||
There was a problem hiding this comment.
${CMAKE_CURRENT_SOURCE_DIR}/config.h sould be ${CMAKE_BINARY_DIR}/config.h. This is wrong on line 12 too (we are not supposed to touch the source directory), please adjust both 😉
|
Squashing commits in your branch in order to keep author information (I am not sure about who would be credited if I use the GitHub "squash" button)… |
- Fix library finding ('nfc' instead of 'libnfc');
- Generate config.h from template on non-win32 platforms;
- While here, include protection for config.h in several files.
As discussed in #57
Please review my changes.
Thanks, stefan