The branch, master has been updated
via 3df55cc36703359384d107e9d10414b2edca6ac4 (commit)
via 9ae4d5f637d4bc0b1bd7845944525370e2c81167 (commit)
via 95d606d80a612a49a25342e2bea0672789d21c80 (commit)
via 0ce1c5662d50affed25983a67185d41814954a81 (commit)
via 85c20de2dec30e8d72aa991fea8e52fb7a996e91 (commit)
via 57fe941af49e350c8c5cecfca0f158b806de3302 (commit)
via 1719ee931f40f7c211e58da7aa7afca83f8cb047 (commit)
from 048eb722b34cb824009db072a0fff9ecd9c84da9 (commit)
- Log -----------------------------------------------------------------
commit 3df55cc36703359384d107e9d10414b2edca6ac4
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Sun Oct 27 09:07:57 2013 +0100
Removed useless cmake instructions
commit 9ae4d5f637d4bc0b1bd7845944525370e2c81167
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Mon Sep 30 22:31:48 2013 +0200
Fixed mingw python installation.
commit 95d606d80a612a49a25342e2bea0672789d21c80
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Mon Sep 23 09:48:49 2013 +0200
Workaround for cmake bug #0013449
commit 0ce1c5662d50affed25983a67185d41814954a81
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Fri Sep 20 08:11:28 2013 +0200
use link dirs.
commit 85c20de2dec30e8d72aa991fea8e52fb7a996e91
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Sat Sep 14 10:35:26 2013 +0200
Configure libftdi1-config only unix & mingw, not win32
commit 57fe941af49e350c8c5cecfca0f158b806de3302
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Fri Sep 13 09:34:44 2013 +0200
Allow libusb detection without pkgconfig.
commit 1719ee931f40f7c211e58da7aa7afca83f8cb047
Author: xantares <xantares09@xxxxxxxxxxx>
Date: Thu Sep 12 22:46:03 2013 +0200
Provide cmake config fo mingw/win32 too.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 51 ++++++++++++++++++++---------------------
cmake/FindUSB1.cmake | 1 +
cmake/LibFTDI1Config.cmake.in | 2 +-
python/CMakeLists.txt | 15 +++++++++--
4 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c9e4236..8e6542c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,38 +170,37 @@ configure_file(${CMAKE_SOURCE_DIR}/libftdipp1.pc.in
${CMAKE_BINARY_DIR}/libftdip
install(FILES ${CMAKE_BINARY_DIR}/libftdi1.pc ${CMAKE_BINARY_DIR}/libftdipp1.pc
DESTINATION lib${LIB_SUFFIX}/pkgconfig)
-if ( UNIX )
+if (UNIX OR MINGW)
configure_file ( libftdi1-config.in
${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config @ONLY )
install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config
DESTINATION bin )
+endif ()
- # config script install path
- if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
- set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 )
- endif ()
-
- set ( LIBFTDI_INCLUDE_DIR ${includedir} )
- set ( LIBFTDI_INCLUDE_DIRS ${LIBFTDI_INCLUDE_DIR} )
- get_target_property( _LIBFTDI_LIBRARY_LOCATION ftdi1 LOCATION )
- get_filename_component ( _LIBFTDI_LIBRARY_NAME ${_LIBFTDI_LIBRARY_LOCATION}
NAME )
- set ( LIBFTDI_LIBRARY ${libdir}/${_LIBFTDI_LIBRARY_NAME} )
- set ( LIBFTDI_LIBRARIES ${LIBFTDI_LIBRARY} )
- list ( APPEND LIBFTDI_LIBRARIES ${LIBUSB_LIBRARIES} )
- get_target_property( _LIBFTDIPP_LIBRARY_LOCATION ftdipp1 LOCATION )
- get_filename_component ( _LIBFTDIPP_LIBRARY_NAME
${_LIBFTDIPP_LIBRARY_LOCATION} NAME )
- set ( LIBFTDIPP_LIBRARY ${libdir}/${_LIBFTDIPP_LIBRARY_NAME} )
+# config script install path
+if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
+ set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi1 )
+endif ()
+
+set ( LIBFTDI_INCLUDE_DIR ${includedir} )
+set ( LIBFTDI_INCLUDE_DIRS ${LIBFTDI_INCLUDE_DIR} )
+set ( LIBFTDI_LIBRARY ftdi1 )
+set ( LIBFTDI_LIBRARIES ${LIBFTDI_LIBRARY} )
+list ( APPEND LIBFTDI_LIBRARIES ${LIBUSB_LIBRARIES} )
+if (FTDI_BUILD_CPP)
+ set ( LIBFTDIPP_LIBRARY ftdi1pp )
set ( LIBFTDIPP_LIBRARIES ${LIBFTDIPP_LIBRARY} )
list ( APPEND LIBFTDIPP_LIBRARIES ${LIBUSB_LIBRARIES} )
- set ( LIBFTDI_ROOT_DIR ${prefix} )
- set ( LIBFTDI_VERSION_STRING ${VERSION_STRING} )
- set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )
- set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
-
- set ( LIBFTDI_USE_FILE
${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
- configure_file ( cmake/LibFTDI1Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
- install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
cmake/UseLibFTDI1.cmake
- DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
- )
endif ()
+set ( LIBFTDI_LIBRARY_DIRS ${libdir} )
+set ( LIBFTDI_ROOT_DIR ${prefix} )
+set ( LIBFTDI_VERSION_STRING ${VERSION_STRING} )
+set ( LIBFTDI_VERSION_MAJOR ${MAJOR_VERSION} )
+set ( LIBFTDI_VERSION_MINOR ${MINOR_VERSION} )
+
+set ( LIBFTDI_USE_FILE
${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI1.cmake )
+configure_file ( cmake/LibFTDI1Config.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake @ONLY )
+install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDI1Config.cmake
cmake/UseLibFTDI1.cmake
+ DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
+ )
include(CPack)
diff --git a/cmake/FindUSB1.cmake b/cmake/FindUSB1.cmake
index 8cb9229..b90e297 100644
--- a/cmake/FindUSB1.cmake
+++ b/cmake/FindUSB1.cmake
@@ -23,6 +23,7 @@ else (LIBUSB_INCLUDE_DIR AND LIBUSB_LIBRARIES)
pkg_check_modules(PC_LIBUSB libusb-1.0)
FIND_PATH(LIBUSB_INCLUDE_DIR libusb.h
+ PATH_SUFFIXES libusb-1.0
PATHS ${PC_LIBUSB_INCLUDEDIR} ${PC_LIBUSB_INCLUDE_DIRS})
FIND_LIBRARY(LIBUSB_LIBRARIES NAMES usb-1.0
diff --git a/cmake/LibFTDI1Config.cmake.in b/cmake/LibFTDI1Config.cmake.in
index 6146bc0..904a9b7 100644
--- a/cmake/LibFTDI1Config.cmake.in
+++ b/cmake/LibFTDI1Config.cmake.in
@@ -15,7 +15,7 @@
# LIBFTDI_FOUND - True if LibFTDI was found on your system
# LIBFTDI_USE_FILE - The file making LibFTDI usable
# LIBFTDI_DEFINITIONS - Definitions needed to build with LibFTDI
-# LIBFTDI_INCLUDE_DIRS - Directory where OT.hxx can be found
+# LIBFTDI_INCLUDE_DIRS - Directory where ftdi.h can be found
# LIBFTDI_INCLUDE_DIRS - List of directories of LibFTDI and it's
dependencies
# LIBFTDI_LIBRARY - LibFTDI library location
# LIBFTDI_LIBRARIES - List of libraries to link against LibFTDI
library
diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9341054..1073ed3 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -2,7 +2,16 @@ option ( PYTHON_BINDINGS "Build python bindings via swig" ON )
option ( LINK_PYTHON_LIBRARY "Link against python libraries" ON )
if ( PYTHON_BINDINGS )
- find_package ( SWIG )
+ # workaround for cmake bug #0013449
+ if ( NOT DEFINED CMAKE_FIND_ROOT_PATH )
+ find_package ( SWIG )
+ else ()
+ find_program ( SWIG_EXECUTABLE NAMES swig2.0 swig )
+ if ( SWIG_EXECUTABLE )
+ set ( SWIG_USE_FILE ${CMAKE_ROOT}/Modules/UseSWIG.cmake )
+ set ( SWIG_FOUND TRUE )
+ endif ()
+ endif ()
find_package ( PythonLibs )
find_package ( PythonInterp )
endif ()
@@ -33,8 +42,8 @@ if ( SWIG_FOUND AND PYTHONLIBS_FOUND AND PYTHONINTERP_FOUND )
${_REL_PYTHON_MODULE_PATH}
)
- INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/_ftdi1.so DESTINATION
${PYTHON_MODULE_PATH} )
- INSTALL ( FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION
${PYTHON_MODULE_PATH} )
+ install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/ftdi1.py DESTINATION
${PYTHON_MODULE_PATH} )
+ install ( TARGETS ${SWIG_MODULE_ftdi1_REAL_NAME} LIBRARY DESTINATION
${PYTHON_MODULE_PATH} )
if ( DOCUMENTATION AND DOXYGEN_FOUND )
hooks/post-receive
--
A library to talk to FTDI chips
--
libftdi-git - see http://www.intra2net.com/en/developer/libftdi for details.
To unsubscribe send a mail to libftdi-git+unsubscribe@xxxxxxxxxxxxxxxxxxxxxxx
|
