From 35cf836113153925d4263ce85361e31e0b9f5deb Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Tue, 16 Mar 2010 22:31:27 +0000
Subject: [PATCH] Detect OpenMP properly.

---
 trunk/src/CMakeLists.txt       | 9 +++++++++
 trunk/src/nvconfig.h.in        | 2 ++
 trunk/src/nvtt/CompressDXT.cpp | 5 +++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/trunk/src/CMakeLists.txt b/trunk/src/CMakeLists.txt
index 344bf38..513e8c8 100644
--- a/trunk/src/CMakeLists.txt
+++ b/trunk/src/CMakeLists.txt
@@ -111,6 +111,15 @@ ELSE(OPENEXR_FOUND)
 	MESSAGE(STATUS "Looking for OpenEXR - not found")
 ENDIF(OPENEXR_FOUND)
 
+# OpenMP
+INCLUDE(FindOpenMP)
+IF(OPENMP_FOUND)
+	SET(HAVE_OPENMP ${OPENMP_FOUND} CACHE BOOL "Set to TRUE if OpenMP is found, FALSE otherwise")
+	MESSAGE(STATUS "Looking for OpenMP - found")
+ELSE(OPENMP_FOUND)
+	MESSAGE(STATUS "Looking for OpenMP - not found")
+ENDIF(OPENMP_FOUND)
+	
 # Qt
 FIND_PACKAGE(Qt4)
 
diff --git a/trunk/src/nvconfig.h.in b/trunk/src/nvconfig.h.in
index a4911ee..9726768 100644
--- a/trunk/src/nvconfig.h.in
+++ b/trunk/src/nvconfig.h.in
@@ -7,6 +7,8 @@
 #cmakedefine HAVE_EXECINFO_H
 #cmakedefine HAVE_MALLOC_H
 
+#cmakedefine HAVE_OPENMP
+
 #cmakedefine HAVE_PNG
 #cmakedefine HAVE_JPEG
 #cmakedefine HAVE_TIFF
diff --git a/trunk/src/nvtt/CompressDXT.cpp b/trunk/src/nvtt/CompressDXT.cpp
index a8684d6..59b89f0 100644
--- a/trunk/src/nvtt/CompressDXT.cpp
+++ b/trunk/src/nvtt/CompressDXT.cpp
@@ -71,9 +71,10 @@ typedef ULONG_PTR DWORD_PTR;
 #include "stb/stb_dxt.h"
 #endif
 
-#pragma message(NV_FILE_LINE "FIXME: Define HAVE_OPENMP from cmake.")
-#define HAVE_OPENMP
+// OpenMP
+#if defined (HAVE_OPENMP)
 #include <omp.h>
+#endif
 
 using namespace nv;
 using namespace nvtt;