[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdegraphics/libs/libkdcraw
From:       Gilles Caulier <caulier.gilles () gmail ! com>
Date:       2009-04-23 9:59:51
Message-ID: 1240480791.421055.24894.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 958020 by cgilles:

fix openmp detection under win32

 M  +19 -1     CMakeLists.txt  
 M  +3 -3      libkdcraw/kdcraw.cpp  
 M  +2 -2      libkdcraw/libraw_config.h.cmake  


--- trunk/KDE/kdegraphics/libs/libkdcraw/CMakeLists.txt #958019:958020
@@ -75,8 +75,10 @@
 # Check gcc version to see if OpenMP support is available to perform parallelized
 # demosaicing with LibRaw
 
-IF (NOT DISABLE_OPENMP)
+IF(NOT DISABLE_OPENMP)
+
     IF(CMAKE_COMPILER_IS_GNUCXX)
+
         EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS --version OUTPUT_VARIABLE \
                VERSION_GCC_INFO)
         STRING(REGEX MATCH " [34]\\.[0-9]\\.[0-9]" GCC_VERSION \
"${VERSION_GCC_INFO}")        
@@ -93,11 +95,27 @@
             MESSAGE(STATUS "GCC version (${GCC_VERSION} ) detected: we will use \
OpenMP extension with LibRaw.")  ADD_DEFINITIONS(-fopenmp)
             SET(OPENMP_LDFLAGS -lgomp)
+	    SET(USE_OPENMP TRUE)
 
+        ELSEIF(GCC_VERSION_GOOD)
+
+            MESSAGE(STATUS "Compiler is an older GCC. OpenMP extension support with \
LibRaw is disabled.") +            SET(USE_OPENMP FALSE)
+	
         ENDIF(GCC_VERSION_GOOD)
+
+    ELSEIF(CMAKE_COMPILER_IS_GNUCXX)
+
+        MESSAGE(STATUS "Compiler is not GCC. OpenMP extension support with LibRaw is \
disabled.") +        SET(USE_OPENMP FALSE)
+	
     ENDIF(CMAKE_COMPILER_IS_GNUCXX)
+
 ELSEIF(NOT DISABLE_OPENMP)
+
     MESSAGE(STATUS "OpenMP extension support with LibRaw is disabled.")
+    SET(USE_OPENMP FALSE)
+
 ENDIF(NOT DISABLE_OPENMP)
 
 # ==================================================================================================
                
--- trunk/KDE/kdegraphics/libs/libkdcraw/libkdcraw/kdcraw.cpp #958019:958020
@@ -758,10 +758,10 @@
 
 bool KDcraw::librawUseGomp()
 {
-#ifdef DISABLE_OPENMP
+#ifdef USE_OPENMP
+    return true;
+#else
     return false;
-#else
-    return true;
 #endif
 }
 
--- trunk/KDE/kdegraphics/libs/libkdcraw/libkdcraw/libraw_config.h.cmake \
#958019:958020 @@ -1,7 +1,7 @@
 #ifndef LIBRAW_CONFIG_H
 #define LIBRAW_CONFIG_H
 
-/* Define to 1 if LibRaw don't use OpenMP shared library to perform parallel \
                demosaicing */
-#cmakedefine DISABLE_OPENMP 1
+/* Define to 1 if LibRaw use OpenMP shared library to perform parallel demosaicing \
*/ +#cmakedefine USE_OPENMP 1
 
 #endif /* LIBRAW_CONFIG_H */


[prev in list] [next in list] [prev in thread] [next in thread]