libftdi-git Archives

Subject: A library to talk to FTDI chips branch, libftdi-0.x, updated. v0.20-7-gc8e975e

From: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
To: libftdi-git@xxxxxxxxxxxxxxxxxxxxxxx
Date: Tue, 23 Dec 2014 15:38:56 +0100 (CET)
The branch, libftdi-0.x has been updated
       via  c8e975e613826577e4af54a14c76dcecac29b33d (commit)
      from  55c86dace5a6a478ade519f3bc848995875702a9 (commit)


- Log -----------------------------------------------------------------
commit c8e975e613826577e4af54a14c76dcecac29b33d
Author: Thomas Jarosch <thomas.jarosch@xxxxxxxxxxxxx>
Date:   Tue Dec 23 15:37:47 2014 +0100

    Fix setting VERSION variable when doxygen is switched off.
    
    Based upon initial patch from Alexander Couzens.

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

Summary of changes:
 CMakeLists.txt |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b68de29..75c69e8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,12 @@
 # Project
 project(libftdi)
+set(PACKAGE libftdi)
 set(MAJOR_VERSION 0)
 set(MINOR_VERSION 20)
+set(VERSION ${VERSION_STRING})
 set(VERSION_STRING ${MAJOR_VERSION}.${MINOR_VERSION})
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
+set(top_srcdir ${CMAKE_SOURCE_DIR})
 
 # CMake
 if("${CMAKE_BUILD_TYPE}" STREQUAL "")
@@ -98,12 +101,6 @@ 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
    message(STATUS "Doxygen found.")
    set(DOXY_DIR "${CMAKE_SOURCE_DIR}/doc")


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, libftdi-0.x, updated. v0.20-7-gc8e975e, libftdi-git <=