From c84cd4328a8a75192bc55ba68991a064c4428836 Mon Sep 17 00:00:00 2001 From: Henry Bruce Date: Mon, 17 Aug 2015 15:53:40 -0700 Subject: [PATCH] cmake: Disable USB sub-platform support by default Signed-off-by: Brendan Le Foll --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e8b98bb..49e96d3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -54,7 +54,7 @@ option (BUILDSWIG "Build swig modules." ON) option (BUILDSWIGPYTHON "Build swig python modules." ON) option (BUILDSWIGNODE "Build swig node modules." ON) option (BUILDSWIGJAVA "Build Java API." OFF) -option (USBPLAT "Detection USB platform." ON) +option (USBPLAT "Detection USB platform." OFF) option (FTDID2XX "Build with FTDI D2xx subplatform support." OFF) option (FTDI4222 "Build with FTDI FT4222 subplatform support." OFF) option (IPK "Generate IPK using CPack" OFF) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8faa785..dbfe9e4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,8 +50,8 @@ endif() if (USBPLAT) message (INFO " - Adding USB platforms") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSBPLAT=1") - find_package (Ftd2xx) if (FTDID2xx) + find_package (Ftd2xx) if (${LIBFTD2XX_FOUND}) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFTDID2XX=1") set (mraa_LIBS ${mraa_LIBS} ${LIBFTD2XX_LIBRARIES}) @@ -59,8 +59,8 @@ if (USBPLAT) message (WARNING " - Enabled FTDID2xx support but library not found") endif () endif () - find_package (Ftd4222) if (FTDI4222) + find_package (Ftd4222) if (${LIBFT4222_FOUND}) set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DFTDI4222=1") set (mraa_LIBS ${mraa_LIBS} ${LIBFT4222_LIBRARIES})