X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=CMakeLists.txt;h=4c43a4818ed080883d66da12835572e30687fbf6;hb=a7c32c59a04044e70612b3ea598ab51b2cff3174;hp=8a871785dbd850b27dc1fc9d54f5754465de2905;hpb=998266bf16a3f88480382070b4af670d5998a1c5;p=libftdi

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a87178..4c43a48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,15 +1,10 @@
 # Project
 project(libftdi)
-set(MAJOR_VERSION 0)
-set(MINOR_VERSION 17)
+set(MAJOR_VERSION 1)
+set(MINOR_VERSION 0)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
 
-option(ASYNC-MODE "enable experimental async mode. Linux only")
-if(ASYNC-MODE)
-  add_definitions(-DLIBFTDI_LINUX_ASYNC_MODE)
-endif(ASYNC-MODE)
-
 # CMake
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
    set(CMAKE_BUILD_TYPE     Debug)
@@ -17,6 +12,8 @@ endif("${CMAKE_BUILD_TYPE}" STREQUAL "")
 set(CMAKE_COLOR_MAKEFILE ON)
 cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 
+add_definitions(-Wall)
+
 # Debug build
 message("-- Build type: ${CMAKE_BUILD_TYPE}")
 if(${CMAKE_BUILD_TYPE} STREQUAL Debug)
@@ -46,23 +43,26 @@ set(CPACK_COMPONENT_SHAREDLIBS_GROUP "Development")
 set(CPACK_COMPONENT_STATICLIBS_GROUP "Development")
 set(CPACK_COMPONENT_HEADERS_GROUP    "Development")
 
+# automatically set lib suffix
+if ( UNIX AND NOT APPLE 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)
 
 # Package information
 set(CPACK_PACKAGE_VERSION              ${VERSION_STRING})
-set(CPACK_PACKAGE_CONTACT              "Marek Vavrusa <marek@vavrusa.com>")
+set(CPACK_PACKAGE_CONTACT              "Intra2net AG <libftdi@developer.intra2net.com>")
 set(CPACK_PACKAGE_DESCRIPTION          "libftdi library.")
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${CPACK_PACKAGE_DESCRIPTION}
                                        )
@@ -99,9 +99,17 @@ endif(${UNIX})
 add_subdirectory(src)
 add_subdirectory(ftdipp)
 add_subdirectory(bindings)
+add_subdirectory(ftdi_eeprom)
 add_subdirectory(examples)
 add_subdirectory(packages)
+add_subdirectory(test)
 
+# "make dist" target
+set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${VERSION_STRING})
+add_custom_target(dist
+    COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD
+            | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 
 
 # Documentation
@@ -127,8 +135,8 @@ if(DOCUMENTATION AND DOXYGEN_FOUND)
    # Create doc directory
    add_custom_command(
    OUTPUT ${CMAKE_BINARY_DIR}/doc
-   COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc
-   COMMAND mkdir ${CMAKE_BINARY_DIR}/doc
+   COMMAND rm -rf ${CMAKE_BINARY_DIR}/doc/{html,man}
+   COMMAND mkdir -p ${CMAKE_BINARY_DIR}/doc
    DEPENDS ftdi ftdipp
    )