The branch, master has been updated
via 20a289681dfee99ea773f3596a7bce049d1394b0 (commit)
from e59bc450ba1b263f549185e16a00c7ab57b6c247 (commit)
- Log -----------------------------------------------------------------
commit 20a289681dfee99ea773f3596a7bce049d1394b0
Author: Uwe Bonnes <bon@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue Sep 29 18:56:03 2009 +0200
For Unix 64-bit builds, use LIB_SUFFIX to install to lib64
-----------------------------------------------------------------------
Summary of changes:
CMakeLists.txt | 15 ++++++++++++---
ftdipp/CMakeLists.txt | 4 ++--
src/CMakeLists.txt | 4 ++--
3 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29586e6..6cbce92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,15 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
set(CPACK_COMPONENT_HEADERS_GROUP "Development")
+# Create suffix to eventually install in lib64
+IF(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET(LIB_SUFFIX "")
+ SET(PACK_ARCH "")
+ ELSE(CMAKE_SIZEOF_VOID_P EQUAL 4)
+ SET(LIB_SUFFIX 64)
+ SET(PACK_ARCH .x86_64)
+endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+
# Package information
set(CPACK_PACKAGE_VERSION ${VERSION_STRING})
set(CPACK_PACKAGE_CONTACT "Marek Vavrusa <marek@xxxxxxxxxxx>")
@@ -49,7 +58,7 @@ if(${UNIX})
set(CPACK_GENERATOR "DEB;RPM")
set(CPACK_CMAKE_GENERATOR "Unix Makefiles")
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
- set(CPACK_PACKAGE_FILE_NAME
${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION})
+ set(CPACK_PACKAGE_FILE_NAME
${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}${PACK_ARCH})
endif(${UNIX})
if(${WIN32})
@@ -125,7 +134,7 @@ set(exec_prefix ${CMAKE_INSTALL_PREFIX}/bin)
set(includedir ${CMAKE_INSTALL_PREFIX}/include/${PROJECT_NAME})
if(${UNIX})
- set(libdir ${CMAKE_INSTALL_PREFIX}/lib)
+ set(libdir ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
endif(${UNIX})
if(${WIN32})
set(libdir ${CMAKE_INSTALL_PREFIX}/bin)
@@ -134,7 +143,7 @@ endif(${WIN32})
configure_file(${CMAKE_SOURCE_DIR}/libftdi.pc.in
${CMAKE_BINARY_DIR}/libftdi.pc @ONLY)
configure_file(${CMAKE_SOURCE_DIR}/libftdipp.pc.in
${CMAKE_BINARY_DIR}/libftdipp.pc @ONLY)
install(FILES ${CMAKE_BINARY_DIR}/libftdi.pc ${CMAKE_BINARY_DIR}/libftdipp.pc
- DESTINATION lib/pkgconfig)
+ DESTINATION lib${LIB_SUFFIX}/pkgconfig)
if(${UNIX})
configure_file(${CMAKE_SOURCE_DIR}/libftdi-config.in
${CMAKE_BINARY_DIR}/libftdi-config @ONLY)
diff --git a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt
index aff4ca3..515dc91 100644
--- a/ftdipp/CMakeLists.txt
+++ b/ftdipp/CMakeLists.txt
@@ -38,12 +38,12 @@ target_link_libraries(ftdipp ftdi ${LIBUSB_LIBRARIES}
${BOOST_LIBRARIES})
if(${UNIX})
install( TARGETS ftdipp
- LIBRARY DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
COMPONENT sharedlibs
)
install( TARGETS ftdipp-static
- ARCHIVE DESTINATION lib
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
COMPONENT staticlibs
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0a6a917..0e12e54 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -27,12 +27,12 @@ target_link_libraries(ftdi ${LIBUSB_LIBRARIES})
if(${UNIX})
install( TARGETS ftdi
- LIBRARY DESTINATION lib
+ LIBRARY DESTINATION lib${LIB_SUFFIX}
COMPONENT sharedlibs
)
install( TARGETS ftdi-static
- ARCHIVE DESTINATION lib
+ ARCHIVE DESTINATION lib${LIB_SUFFIX}
COMPONENT staticlibs
)
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
|
