libftdi-git Archives

Subject: A library to talk to FTDI chips branch, master, updated. v0.17-294-gb3f439b

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Fri, 21 Oct 2011 14:18:27 +0200 (CEST)
The branch, master has been updated
       via  b3f439b157caa175b276d59c991354d90d88d7c6 (commit)
      from  4c5afeb9e12c71d51950d597c8fe70d5aeb6245e (commit)


- Log -----------------------------------------------------------------
commit b3f439b157caa175b276d59c991354d90d88d7c6
Author: Michel Zou <xantares09@xxxxxxxxxxx>
Date:   Fri Oct 21 14:17:49 2011 +0200

    Drop 64bit lib suffix on debian systems

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f7df0a9..c6a823f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -43,17 +43,20 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
 set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP    "Development")
 
+if(UNIX AND NOT CMAKE_CROSSCOMPILING AND NOT EXISTS "/etc/debian_version")
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT LIB_SUFFIX)
+    set(LIB_SUFFIX "64")
+  endif()
+endif()
+
 if(NOT APPLE)
   # 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 8)
-      SET(LIB_SUFFIX 64)
       SET(PACK_ARCH .x86_64)
   endif(CMAKE_SIZEOF_VOID_P EQUAL 4)
 else(NOT APPLE)
-  SET(LIB_SUFFIX "")
   SET(PACK_ARCH "")
 endif(NOT APPLE)
 


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   

Current Thread
  • A library to talk to FTDI chips branch, master, updated. v0.17-294-gb3f439b, libftdi-git <=