From 62a0ab5ee8d9cb5dbe4d1771f614db15352d7f25 Mon Sep 17 00:00:00 2001 From: Jon Szymaniak Date: Fri, 19 Sep 2014 12:05:59 -0400 Subject: [PATCH] cmake: Skip libc & libusb version checks when cross-compiling These checks break cross-compilation, as they require code to be run on the host machine. --- host/CMakeLists.txt | 11 +++++++---- host/cmake/modules/FindLibUSB.cmake | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/host/CMakeLists.txt b/host/CMakeLists.txt index c637d7ed..20374171 100644 --- a/host/CMakeLists.txt +++ b/host/CMakeLists.txt @@ -119,10 +119,13 @@ endif(MSVC) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "BSD") set(BLADERF_OS_LINUX 1) - try_run(LIBC_VERSION_RUN_RESULT LIBC_VERSION_COMPILE_RESULT - ${CMAKE_CURRENT_BINARY_DIR}/cmake/helpers - ${CMAKE_CURRENT_SOURCE_DIR}/cmake/helpers/libc_version.c - RUN_OUTPUT_VARIABLE LIBC_VERSION) + if(NOT CMAKE_CROSSCOMPILING) + message(STATUS "Checking libc version...") + try_run(LIBC_VERSION_RUN_RESULT LIBC_VERSION_COMPILE_RESULT + ${CMAKE_CURRENT_BINARY_DIR}/cmake/helpers + ${CMAKE_CURRENT_SOURCE_DIR}/cmake/helpers/libc_version.c + RUN_OUTPUT_VARIABLE LIBC_VERSION) + endif(NOT CMAKE_CROSSCOMPILING) if(LIBC_VERSION) message(STATUS "libc version: ${LIBC_VERSION}") diff --git a/host/cmake/modules/FindLibUSB.cmake b/host/cmake/modules/FindLibUSB.cmake index 4645e059..b33e765a 100644 --- a/host/cmake/modules/FindLibUSB.cmake +++ b/host/cmake/modules/FindLibUSB.cmake @@ -120,7 +120,7 @@ if(LIBUSB_FOUND) check_include_file("{LIBUSB_HEADER_FILE}" LIBUSB_FOUND) endif(LIBUSB_FOUND) -if(LIBUSB_FOUND) +if(LIBUSB_FOUND AND NOT CMAKE_CROSSCOMPILING) # Introduced in v1.0.9 - these functions are absolutely required check_library_exists("${usb_LIBRARY}" libusb_error_name "" LIBUSB_HAVE_ERROR_NAME)