Fix build with CMake
- 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.
This commit is contained in:
parent
358df7759a
commit
565ee18b8e
25 changed files with 94 additions and 24 deletions
|
|
@ -9,12 +9,23 @@ find_package(LIBNFC REQUIRED)
|
|||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
IF(WIN32)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_SOURCE_DIR}/config.h)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_windows.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
|
||||
include_directories(${CMAKE_CURRENT_SOURCE_DIR}/contrib/win32)
|
||||
find_library(WINSOCK_LIB libws2_32.a)
|
||||
set(LIBS ${LIBS} ${WINSOCK_LIB})
|
||||
ELSE(WIN32)
|
||||
include(CheckIncludeFiles)
|
||||
check_include_files("sys/endian.h" HAVE_SYS_ENDIAN_H)
|
||||
check_include_files("endian.h" HAVE_ENDIAN_H)
|
||||
check_include_files("byteswap.h" HAVE_BYTESWAP_H)
|
||||
check_include_files("CoreFoundation/CoreFoundation.h" HAVE_COREFOUNDATION_COREFOUNDATION_H)
|
||||
set(_XOPEN_SOURCE 600)
|
||||
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/config_posix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/include/config.h)
|
||||
ENDIF(WIN32)
|
||||
|
||||
include_directories(${CMAKE_CURRENT_BINARY_DIR}/include/)
|
||||
add_definitions("-DHAVE_CONFIG_H")
|
||||
|
||||
if(MINGW)
|
||||
# force MinGW-w64 in 32bit mode
|
||||
add_definitions("-m32")
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue