From 1ad201ddf6ad8c2f3db2fe07e9f809bdd303ce06 Mon Sep 17 00:00:00 2001 From: Jeffrey Quesnelle Date: Fri, 22 Feb 2019 11:18:41 -0500 Subject: [PATCH] add missed LIBFTDI_ prefixes --- CMakeLists.txt | 3 +++ third-party/libftdi/ftdipp/CMakeLists.txt | 2 +- third-party/libftdi/python/CMakeLists.txt | 8 ++++---- third-party/libftdi/src/CMakeLists.txt | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2e877f..92a9319 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -136,6 +136,9 @@ if(NOT WIN32) set(LIBFTDI_DOCUMENTATION OFF) set(LIBFTDI_BUILD_TESTS OFF) set(LIBFTDI_INSTALL OFF) + set(LIBFTDI_PYTHON_BINDINGS OFF) + set(LIBFTDI_LINK_PYTHON_LIBRARY OFF) + set(FTDI_EEPROM OFF) add_subdirectory(third-party/libftdi) endif(NOT WIN32) diff --git a/third-party/libftdi/ftdipp/CMakeLists.txt b/third-party/libftdi/ftdipp/CMakeLists.txt index ad2db72..677d29f 100644 --- a/third-party/libftdi/ftdipp/CMakeLists.txt +++ b/third-party/libftdi/ftdipp/CMakeLists.txt @@ -39,7 +39,7 @@ if (FTDIPP) ) # Static library - if ( STATICLIBS ) + if ( LIBFTDI_STATICLIBS ) add_library(ftdipp1-static STATIC ${cpp_sources}) target_include_directories(ftdipp1-static BEFORE PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/third-party/libftdi/python/CMakeLists.txt b/third-party/libftdi/python/CMakeLists.txt index 31ef1c6..06556e0 100644 --- a/third-party/libftdi/python/CMakeLists.txt +++ b/third-party/libftdi/python/CMakeLists.txt @@ -1,7 +1,7 @@ -option ( PYTHON_BINDINGS "Build python bindings via swig" ON ) -option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) +option ( LIBFTDI_PYTHON_BINDINGS "Build python bindings via swig" ON ) +option ( LIBFTDI_LINK_PYTHON_LIBRARY "Link against python libraries" ON ) -if ( PYTHON_BINDINGS ) +if ( LIBFTDI_PYTHON_BINDINGS ) # workaround for cmake bug #0013449 if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) find_package ( SWIG ) @@ -28,7 +28,7 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND ) swig_add_module ( ftdi1 python ftdi1.i ) swig_link_libraries ( ftdi1 ftdi1 ) - if ( LINK_PYTHON_LIBRARY ) + if ( LIBFTDI_LINK_PYTHON_LIBRARY ) swig_link_libraries ( ftdi1 ${PYTHON_LIBRARIES} ) elseif( APPLE ) set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" ) diff --git a/third-party/libftdi/src/CMakeLists.txt b/third-party/libftdi/src/CMakeLists.txt index 9fd86a6..386c590 100644 --- a/third-party/libftdi/src/CMakeLists.txt +++ b/third-party/libftdi/src/CMakeLists.txt @@ -38,7 +38,7 @@ install ( TARGETS ftdi1 ARCHIVE DESTINATION lib${LIB_SUFFIX} ) -if ( STATICLIBS ) +if ( LIBFTDI_STATICLIBS ) add_library(ftdi1-static STATIC ${c_sources}) target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES}) set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")