From 8485996f131d4142c9a5df2b2bec7642037aa0dc Mon Sep 17 00:00:00 2001 From: Julien Schueller Date: Tue, 12 Mar 2013 20:54:50 +0100 Subject: [PATCH] Fix cmake build failure under linux The LIBUSB_FOUND variable was used before the libusb detection was performed. Fixes issue 240. --- CMakeLists.txt | 2 ++ libnfc/CMakeLists.txt | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index cce782f..a6c3946 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -111,6 +111,8 @@ IF (WIN32) ENDIF(PCRE_INCLUDE_DIRS) ENDIF(WIN32) +INCLUDE(LibnfcDrivers) + IF(PCSC_INCLUDE_DIRS) INCLUDE_DIRECTORIES(${PCSC_INCLUDE_DIRS}) LINK_DIRECTORIES(${PCSC_LIBRARY_DIRS}) diff --git a/libnfc/CMakeLists.txt b/libnfc/CMakeLists.txt index 54f2690..f03f0ca 100644 --- a/libnfc/CMakeLists.txt +++ b/libnfc/CMakeLists.txt @@ -19,8 +19,6 @@ ELSE(LIBUSB_FOUND) ENDIF(LIBUSB_FOUND) INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/buses) -INCLUDE(LibnfcDrivers) - IF(WIN32) # Windows now requires regex, so we utilize PCRE # since Windows doesn't get the benefit of finding in CMake