jarjar/libnfc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix cmake build failure under linux

Browse Source 
The LIBUSB_FOUND variable was used before the libusb detection was performed.
Fixes issue 240.
This commit is contained in:
Julien Schueller 2013-03-12 20:54:50 +01:00 committed by Philippe Teuwen
parent ecc12d28aa
commit 8485996f13
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -111,6 +111,8 @@ IF (WIN32)
ENDIF(PCRE_INCLUDE_DIRS) ENDIF(PCRE_INCLUDE_DIRS)
ENDIF(WIN32) ENDIF(WIN32)
INCLUDE(LibnfcDrivers)
IF(PCSC_INCLUDE_DIRS) IF(PCSC_INCLUDE_DIRS)
INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS})
LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS}) LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS})

2
libnfc/CMakeLists.txt
View File

@ -19,8 +19,6 @@ ELSE(LIBUSB_FOUND)
ENDIF(LIBUSB_FOUND) ENDIF(LIBUSB_FOUND)
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses)
INCLUDE(LibnfcDrivers)
IF(WIN32) IF(WIN32)
# Windows now requires regex, so we utilize PCRE # Windows now requires regex, so we utilize PCRE
# since Windows doesn't get the benefit of finding in CMake # since Windows doesn't get the benefit of finding in CMake