[clfft] 60/109: Merge branch 'develop'

[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 801830a421bf9579edc654fad4f21748473c4e31
Merge: d0394b1 d6dcb18
Author: bragadeesh <bragadeesh.natarajan at amd>
Date:   Wed Feb 11 12:00:45 2015 -0600

    Merge branch 'develop'
    
    Conflicts:
    	src/CMakeLists.txt
    
    Update the revision number to 2.4 to resolve the conflict

 README.md                |  9 ++++-----
 src/CMakeLists.txt       | 35 ++++++++++++++++++++---------------
 src/FindOpenCL.cmake     |  6 ++++++
 src/library/private.h    | 19 +++++++++++++++++++
 src/tests/cl_transform.h | 15 ++++++++-------
 5 files changed, 57 insertions(+), 27 deletions(-)

diff --cc src/CMakeLists.txt
index f961794,c43e953..ec5fc4b
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -40,7 -40,7 +40,7 @@@ if( NOT DEFINED CLFFT_VERSION_MAJOR 
  endif( )
  
  if( NOT DEFINED CLFFT_VERSION_MINOR )
-     set( CLFFT_VERSION_MINOR 2 )
 -    set( CLFFT_VERSION_MINOR 3 )
++    set( CLFFT_VERSION_MINOR 4 )
  endif( )
  
  if( NOT DEFINED CLFFT_VERSION_PATCH )
@@@ -205,10 -205,15 +205,15 @@@ 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}" )
- 	
+ 
+ 	# For linux debug builds, define the same preprocessing symbols as win to keep it simple
+ 	if( CMAKE_BUILD_TYPE MATCHES "Debug" )
+ 		add_definitions( "/D_DEBUG" )
+ 	endif( )
+ 
  	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