Smoke: decoupling of wavelet #2, new noise strength option on gui, fftw3 option in place for cmake, scons yet uncommited

CMakeLists.txt

@@ -68,6 +68,7 @@ OPTION(WITH_OPENJPEG		"Enable OpenJpeg Support (http://www.openjpeg.org/)"	OFF)
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
+OPTION(WITH_FFTW3		"Enable FFTW3 support"				OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
@@ -156,6 +157,13 @@ IF(UNIX AND NOT APPLE)
   SET(FFMPEG_INC ${FFMPEG}/include)
   SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale)
   SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+  
+  IF(WITH_FFTW3)
+	  SET(FFTW3 /usr)
+	  SET(FFTW3_INC ${FFTW3}/include)
+	  SET(FFTW3_LIB fftw3)
+	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
+  ENDIF(WITH_FFTW3)
 
   FIND_PACKAGE(JPEG REQUIRED)
 
@@ -234,6 +242,13 @@ IF(WIN32)
   SET(ICONV_LIB iconv)
   SET(ICONV_LIBPATH ${ICONV}/lib)
   
+  IF(WITH_FFTW3)
+	  SET(FFTW3 ${LIBDIR}/fftw3)
+	  SET(FFTW3_INC ${FFTW3}/include)
+	  SET(FFTW3_LIB libfftw)
+	  SET(FFTW3_LIBPATH ${FFTW3}/lib)
+  ENDIF(WITH_FFTW3)
+  
   SET(GETTEXT ${LIBDIR}/gettext)
   SET(GETTEXT_INC ${GETTEXT}/include)
   IF(CMAKE_CL_64)
@@ -367,6 +382,13 @@ IF(APPLE)
   SET(GETTEXT_INC "${GETTEXT}/include")
   SET(GETTEXT_LIB intl iconv)
   SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+  
+  IF(WITH_FFTW3)
+    SET(FFTW3 ${LIBDIR}/fftw3)
+	SET(FFTW3_INC ${FFTW3}/include)
+	SET(FFTW3_LIB libfftw)
+	SET(FFTW3_LIBPATH ${FFTW3}/lib)
+  ENDIF(WITH_FFTW3)
 
   SET(PNG_LIBRARIES png)
   SET(JPEG_LIBRARY jpeg)