[clfft] 53/109: Merge branch 'develop' Bump version to v2.2

[Jérôme Kieffer]

This is an automated email from the git hooks/post-receive script.

kieffer-guest pushed a commit to branch debian
in repository clfft.

commit d0394b1a62a4214ddd60e239f35c02fb61a4f68a
Merge: e7b02b4 2217b68
Author: Kent Knox <kent.knox at amd>
Date:   Thu Jun 19 16:10:35 2014 -0500

    Merge branch 'develop'
    Bump version to v2.2
    
    Conflicts:
    	README.md
    	src/CMakeLists.txt

 .travis.yml                                      |  44 ++++++++
 CHANGELOG                                        |  31 ------
 README.md                                        | 124 ++++++++++++++++++-----
 doc/clFFT.doxy                                   |   2 +-
 src/CMakeLists.txt                               | 114 ++++++++++++---------
 src/FindFFTW.cmake                               |  73 ++++++-------
 src/FindOpenCL.cmake                             |  60 +++++------
 src/FindclFFT.cmake                              |  61 +++++++++++
 src/client/CMakeLists.pack                       |  18 +++-
 src/client/CMakeLists.txt                        |  31 ++----
 src/client/openCL.misc.h                         |   2 +-
 src/include/clFFT.h                              |   3 +-
 src/include/{version.h.in => clFFT.version.h.in} |   0
 src/include/sharedLibrary.h                      |   2 +-
 src/include/stdafx.h                             |   5 +-
 src/library/CMakeLists.txt                       |  68 +++++++++----
 src/library/clFFT.pc.in                          |  12 +++
 src/library/generator.copy.cpp                   |  47 +++++----
 src/library/generator.stockham.cpp               |  38 +++++--
 src/library/generator.transpose.cpp              |  12 ++-
 src/library/generator.transpose.h                |   4 -
 src/library/mainpage.h                           |   6 ++
 src/library/plan.cpp                             |  45 +++++---
 src/library/plan.h                               |   8 +-
 src/library/private.h                            |   6 +-
 src/library/repo.cpp                             |  65 +++++++++---
 src/library/repo.h                               |  19 ++--
 src/library/transform.cpp                        |  12 ++-
 src/scripts/perf/CMakeLists.txt                  |   8 +-
 src/statTimer/CMakeLists.txt                     |  30 +++---
 src/statTimer/statisticalTimer.CPU.h             |   3 +-
 src/statTimer/stdafx.h                           |   3 +
 src/tests/CMakeLists.txt                         |  39 ++++---
 src/tests/copyTestDependencies.cmake.in          | 100 ++++++++++++++++++
 src/tests/gtest_main.cpp                         |   8 +-
 src/tests/test_constants.cpp                     |   1 -
 36 files changed, 767 insertions(+), 337 deletions(-)

diff --cc src/CMakeLists.txt
index 5589649,6f201b5..f961794
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -26,15 -35,22 +35,22 @@@ endif( 
  project( clFFT )
  
  # Define a version for the code
- set( CLFFT_VERSION_MAJOR 2 )
- set( CLFFT_VERSION_MINOR 0 )
- set( CLFFT_VERSION_PATCH 0 )
+ if( NOT DEFINED CLFFT_VERSION_MAJOR )
+     set( CLFFT_VERSION_MAJOR 2 )
+ endif( )
+ 
+ if( NOT DEFINED CLFFT_VERSION_MINOR )
 -    set( CLFFT_VERSION_MINOR 1 )
++    set( CLFFT_VERSION_MINOR 2 )
+ endif( )
+ 
+ if( NOT DEFINED CLFFT_VERSION_PATCH )
+     set( CLFFT_VERSION_PATCH 0 )
+ endif( )
+ 
  set( CLFFT_VERSION "${CLFFT_VERSION_MAJOR}.${CLFFT_VERSION_MINOR}.${CLFFT_VERSION_PATCH}")
 -
 +	
- # uncomment these to debug nmake and borland makefiles
- #SET(CMAKE_START_TEMP_FILE "")
- #SET(CMAKE_END_TEMP_FILE "")
- #SET(CMAKE_VERBOSE_MAKEFILE 1)
+ # This is incremented when the ABI to the library changes
+ set( CLFFT_SOVERSION 2 )
  
  set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR} )
  
@@@ -184,7 -205,10 +205,10 @@@ elseif( CMAKE_COMPILER_IS_GNUCXX 
  		# we only want c++0x if we're using gcc 4.5.2
  		set( CMAKE_CXX_FLAGS "-std=c++0x ${CMAKE_CXX_FLAGS}" )
  	endif()
 -
 +	
+ 	set( CMAKE_CXX_FLAGS "-pthread ${CMAKE_CXX_FLAGS}" )
+ 	set( CMAKE_C_FLAGS "-pthread ${CMAKE_C_FLAGS}" )
+ 	
  	if( BUILD64 )
  		set( CMAKE_CXX_FLAGS "-m64 ${CMAKE_CXX_FLAGS}" )
  		set( CMAKE_C_FLAGS "-m64 ${CMAKE_C_FLAGS}" )

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git