[clfft] 46/64: Fixing static build condition in CMakeLists

Jérôme Kieffer kieffer-guest at moszumanska.debian.org
Wed May 20 07:33:36 UTC 2015


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

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

commit 0ffd52f999722cc1be95558b0741cf572b1c49cf
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Wed Mar 25 11:43:41 2015 -0400

    Fixing static build condition in CMakeLists
---
 src/CMakeLists.txt  |  4 ++--
 src/include/clFFT.h | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index d339496..ef69bc3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -247,8 +247,8 @@ install( FILES
 		DESTINATION
 			"./include" )
 
-if( NOT BUILD_SHARED_LIBS )
-        add_definitions( -DBUILD_STATIC )
+if( NOT BUILD_SHARED_LIBRARY )
+    add_definitions( -DBUILD_STATIC )
 endif()
 
 # Recurse into subdirectory and start building files there
diff --git a/src/include/clFFT.h b/src/include/clFFT.h
index fb984ed..08eea51 100644
--- a/src/include/clFFT.h
+++ b/src/include/clFFT.h
@@ -47,13 +47,13 @@
 		#define inline __inline
 	#endif
 
-        #if defined( BUILD_STATIC )
-                #define CLFFTAPI
-        #elif defined( CLFFT_EXPORTS )
-		#define CLFFTAPI __declspec( dllexport )
-	#else
-		#define CLFFTAPI __declspec( dllimport )
-	#endif
+    #if defined( BUILD_STATIC )
+        #define CLFFTAPI
+    #elif defined( CLFFT_EXPORTS )
+        #define CLFFTAPI __declspec( dllexport )
+    #else
+        #define CLFFTAPI __declspec( dllimport )
+    #endif
 #else
 	#define CLFFTAPI
 #endif

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



More information about the debian-science-commits mailing list