X-Git-Url: http://developer.intra2net.com/git/?p=libftdi;a=blobdiff_plain;f=CMakeLists.txt;h=c98482721df34a29c8a5d61bb4e476807eb171a0;hp=c6a823f43c147f76484faf58c13d0745294c3015;hb=7a07197c9730977af3789b28a89f0b4033543fb7;hpb=b3f439b157caa175b276d59c991354d90d88d7c6

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c6a823f..c984827 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,10 @@
 # Project
 project(libftdi)
-set(MAJOR_VERSION 0)
-set(MINOR_VERSION 99)
+set(MAJOR_VERSION 1)
+set(MINOR_VERSION 0)
+set(PACKAGE libftdi)
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
+set(VERSION ${VERSION_STRING})
 SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
 
 # CMake
@@ -43,14 +45,14 @@ 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()
+# 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(PACK_ARCH "")
     else(CMAKE_SIZEOF_VOID_P EQUAL 8)
@@ -116,12 +118,11 @@ add_custom_target(dist
 
 option(DOCUMENTATION "Generate API documentation with Doxygen" ON)
 
+
 find_package(Doxygen)
 if(DOCUMENTATION AND DOXYGEN_FOUND)
 
    # Set variables
-   set(PACKAGE libftdi)
-   set(VERSION ${VERSION_STRING})
    set(top_srcdir ${CMAKE_SOURCE_DIR})
 
    # Find doxy config
@@ -173,8 +174,8 @@ install(FILES ${CMAKE_BINARY_DIR}/libftdi.pc ${CMAKE_BINARY_DIR}/libftdipp.pc
         DESTINATION lib${LIB_SUFFIX}/pkgconfig)
 
 if(${UNIX})
-    configure_file(${CMAKE_SOURCE_DIR}/libftdi-config.in ${CMAKE_BINARY_DIR}/libftdi-config @ONLY)
-    install(PROGRAMS ${CMAKE_BINARY_DIR}/libftdi-config DESTINATION bin)
+    configure_file(${CMAKE_SOURCE_DIR}/libftdi1-config.in ${CMAKE_BINARY_DIR}/libftdi1-config @ONLY)
+    install(PROGRAMS ${CMAKE_BINARY_DIR}/libftdi1-config DESTINATION bin)
 endif(${UNIX})
 
 include(CPack)