sven
/
libicsneo
mirror of https://github.com/intrepidcs/libicsneo.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

add missed LIBFTDI_ prefixes

pull/4/head
Jeffrey Quesnelle 2019-02-22 11:18:41 -05:00
parent d680f5dfc6
commit 1ad201ddf6
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -136,6 +136,9 @@ if(NOT WIN32)
set(LIBFTDI_DOCUMENTATION OFF) set(LIBFTDI_DOCUMENTATION OFF)
set(LIBFTDI_BUILD_TESTS OFF) set(LIBFTDI_BUILD_TESTS OFF)
set(LIBFTDI_INSTALL 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) add_subdirectory(third-party/libftdi)
endif(NOT WIN32) endif(NOT WIN32)

2
third-party/libftdi/ftdipp/CMakeLists.txt vendored
View File

@ -39,7 +39,7 @@ if (FTDIPP)
) )
# Static library # Static library
if ( STATICLIBS ) if ( LIBFTDI_STATICLIBS )
add_library(ftdipp1-static STATIC ${cpp_sources}) add_library(ftdipp1-static STATIC ${cpp_sources})
target_include_directories(ftdipp1-static BEFORE PUBLIC ${CMAKE_CURRENT_BINARY_DIR} target_include_directories(ftdipp1-static BEFORE PUBLIC ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}

8
third-party/libftdi/python/CMakeLists.txt vendored
View File

@ -1,7 +1,7 @@
option ( PYTHON_BINDINGS "Build python bindings via swig" ON ) option ( LIBFTDI_PYTHON_BINDINGS "Build python bindings via swig" ON )
option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON ) option ( LIBFTDI_LINK_PYTHON_LIBRARY "Link against python libraries" ON )
if ( PYTHON_BINDINGS ) if ( LIBFTDI_PYTHON_BINDINGS )
# workaround for cmake bug #0013449 # workaround for cmake bug #0013449
if ( NOT DEFINED CMAKE_FIND_ROOT_PATH ) if ( NOT DEFINED CMAKE_FIND_ROOT_PATH )
find_package ( SWIG ) find_package ( SWIG )
@ -28,7 +28,7 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
swig_add_module ( ftdi1 python ftdi1.i ) swig_add_module ( ftdi1 python ftdi1.i )
swig_link_libraries ( ftdi1 ftdi1 ) swig_link_libraries ( ftdi1 ftdi1 )
if ( LINK_PYTHON_LIBRARY ) if ( LIBFTDI_LINK_PYTHON_LIBRARY )
swig_link_libraries ( ftdi1 ${PYTHON_LIBRARIES} ) swig_link_libraries ( ftdi1 ${PYTHON_LIBRARIES} )
elseif( APPLE ) elseif( APPLE )
set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" ) set_target_properties ( ${SWIG_MODULE_ftdi1_REAL_NAME} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup" )

2
third-party/libftdi/src/CMakeLists.txt vendored
View File

@ -38,7 +38,7 @@ install ( TARGETS ftdi1
ARCHIVE DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}
) )
if ( STATICLIBS ) if ( LIBFTDI_STATICLIBS )
add_library(ftdi1-static STATIC ${c_sources}) add_library(ftdi1-static STATIC ${c_sources})
target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES}) target_link_libraries(ftdi1-static ${LIBUSB_LIBRARIES})
set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1") set_target_properties(ftdi1-static PROPERTIES OUTPUT_NAME "ftdi1")