The branch, master has been updated
via 419133b89b042e22c6043e96416ca786b8528bfb (commit)
from 4af77d33ddfb96c32760ee9a662fa34c6678e792 (commit)
- Log -----------------------------------------------------------------
commit 419133b89b042e22c6043e96416ca786b8528bfb
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date: Wed Jan 23 11:30:10 2013 +0100
Fixed cmake script installation dir on rpm distro.
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 233d1da..266f08c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -168,6 +168,11 @@ if ( UNIX )
install ( PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/libftdi1-config
DESTINATION bin )
+ # config script install path
+ if ( NOT DEFINED LIBFTDI_CMAKE_CONFIG_DIR )
+ set ( LIBFTDI_CMAKE_CONFIG_DIR lib${LIB_SUFFIX}/cmake/libftdi )
+ endif ()
+
get_target_property( _LIBFTDI_LIBRARY_LOCATION ftdi1 LOCATION )
get_filename_component ( _LIBFTDI_LIBRARY_NAME ${_LIBFTDI_LIBRARY_LOCATION}
NAME )
set ( LIBFTDI_INCLUDE_DIR ${includedir} )
@@ -179,10 +184,11 @@ if ( UNIX )
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}/lib/cmake/libftdi/UseLibFTDI.cmake )
+
+ set ( LIBFTDI_USE_FILE
${CMAKE_INSTALL_PREFIX}/${LIBFTDI_CMAKE_CONFIG_DIR}/UseLibFTDI.cmake )
configure_file ( LibFTDIConfig.cmake.in
${CMAKE_CURRENT_BINARY_DIR}/LibFTDIConfig.cmake @ONLY )
install ( FILES ${CMAKE_CURRENT_BINARY_DIR}/LibFTDIConfig.cmake
UseLibFTDI.cmake
- DESTINATION lib/cmake/libftdi
+ DESTINATION ${LIBFTDI_CMAKE_CONFIG_DIR}
)
endif ()
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
|
