[clfft] 19/109: Merge pull request #18 from kknox/mingwSupport

[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 8506ac07f6b97355dd41eaa3f9552ba4de688a89
Merge: e3536fe 943fae2
Author: Timmy <timmy.liu at amd.com>
Date:   Thu Sep 12 06:59:17 2013 -0700

    Merge pull request #18 from kknox/mingwSupport
    
    Adding mingw32 support as a compilation platform

 src/CMakeLists.txt                   | 4 ++--
 src/client/openCL.misc.h             | 2 +-
 src/include/sharedLibrary.h          | 2 +-
 src/include/stdafx.h                 | 5 ++++-
 src/library/private.h                | 6 ++++--
 src/statTimer/statisticalTimer.CPU.h | 3 ++-
 src/statTimer/stdafx.h               | 3 +++
 src/tests/CMakeLists.txt             | 6 +++++-
 src/tests/gtest_main.cpp             | 6 ++++--
 src/tests/test_constants.cpp         | 1 -
 10 files changed, 26 insertions(+), 12 deletions(-)

diff --cc src/CMakeLists.txt
index e4573a2,2e8c7a6..450a383
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -208,11 -205,11 +208,11 @@@ elseif( CMAKE_COMPILER_IS_GNUCXX 
          set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --coverage")
      endif()
  else( )
 -	message( FATAL_ERROR "Compiler name not detected" )
 +	message( FATAL_ERROR "Compiler not supported or not detected" )
  endif( )
  
- # If UNICODE is defined, pass extra definitions into 
- if( UNICODE )
+ # If UNICODE is defined for microsoft compilers, pass extra definitions
+ if( MSVC AND UNICODE )
  	add_definitions( "/DUNICODE /D_UNICODE" )
  endif( )
  

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