CMake: Configure: Add fftw support.

cmake/modules/FindFFTW.cmake

@@ -0,0 +1,129 @@
+# Filename: FindFFTW.cmake
+# Author: Unknown (???), kestred (29 Nov, 2013)
+#
+# Usage:
+#   find_package(FFTW [REQUIRED] [QUIET])
+#
+# It sets the following variables:
+#  HAVE_FFTW  - true if fftw is found on the system
+#  FFTW_IPATH - the fftw include directory
+#  FFTW_LPATH - the fftw library directory
+#
+# The following variables will be checked by the function
+#   FFTW_USE_STATIC_LIBS - if true, only static libraries are found
+#   FFTW_ROOT            - if set, the libraries are exclusively searched under this path
+#
+
+if(FFTW_IPATH AND FFTW_LPATH)
+	set(HAVE_FFTW TRUE)
+else()
+	# Check if we can use PkgConfig
+	find_package(PkgConfig QUIET)
+
+	#Determine from PKG
+	if(PKG_CONFIG_FOUND AND NOT FFTW_ROOT)
+		pkg_check_modules(PKG_FFTW QUIET "fftw3")
+	endif()
+
+	#Check whether to search static or dynamic libs
+	set(CMAKE_FIND_LIBRARY_SUFFIXES_SAVED ${CMAKE_FIND_LIBRARY_SUFFIXES})
+
+	if(${FFTW_USE_STATIC_LIBS})
+		set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_STATIC_LIBRARY_SUFFIX})
+	else()
+		set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_SHARED_LIBRARY_SUFFIX})
+	endif()
+
+
+	if(FFTW_ROOT)
+		# Try to find headers under root
+		find_path(FFTW_IPATH
+			NAMES "fftw3.h"
+			PATHS ${FFTW_ROOT}
+			PATH_SUFFIXES "include"
+			NO_DEFAULT_PATH
+		)
+
+		# Try to find library under root
+		find_library(FFTW_LIBRARY
+			NAMES "fftw3"
+			PATHS ${FFTW_ROOT}
+			PATH_SUFFIXES "lib" "lib64"
+			NO_DEFAULT_PATH
+		)
+
+		find_library(FFTW_FFTWF_LIBRARY
+			NAMES "fftw3f"
+			PATHS ${FFTW_ROOT}
+			PATH_SUFFIXES "lib" "lib64"
+			NO_DEFAULT_PATH
+		)
+
+		find_library(FFTW_FFTWL_LIBRARY
+			NAMES "fftw3l"
+			PATHS ${FFTW_ROOT}
+			PATH_SUFFIXES "lib" "lib64"
+			NO_DEFAULT_PATH
+		)
+	else()
+		# Find headers the normal way
+		find_path(FFTW_IPATH
+			NAMES "fftw3.h"
+			PATHS ${PKG_FFTW_INCLUDE_DIRS}
+			      ${INCLUDE_INSTALL_DIR}
+			      "/usr/include"
+			      "/usr/local/include"
+			PATH_SUFFIXES "" "fftw"
+		)
+
+		# Find library the normal way
+		find_library(FFTW_LIBRARY
+			NAMES "fftw3"
+			PATHS ${PKG_FFTW_LIBRARY_DIRS}
+			      ${LIB_INSTALL_DIR}
+			      "/usr"
+			      "/usr/local"
+			PATH_SUFFIXES "" "lib" "lib32" "lib64"
+		)
+
+		find_library(FFTW_FFTWF_LIBRARY
+			NAMES "fftw3f"
+			PATHS ${PKG_FFTW_LIBRARY_DIRS}
+			      ${LIB_INSTALL_DIR}
+			      "/usr"
+			      "/usr/local"
+			PATH_SUFFIXES "" "lib" "lib32" "lib64"
+		)
+
+
+		find_library(FFTW_FFTWL_LIBRARY
+			NAMES "fftw3l"
+			PATHS ${PKG_FFTW_LIBRARY_DIRS}
+			      ${LIB_INSTALL_DIR}
+			      "/usr"
+			      "/usr/local"
+			PATH_SUFFIXES "" "lib" "lib32" "lib64"
+		)
+	endif()
+
+	# Cleanup after the library suffixes
+	set(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_SAVED})
+	unset(CMAKE_FIND_LIBRARY_SUFFIXES_SAVED)
+
+	# Get the directory conaining FFTW_LIBRARY
+	get_filename_component(FFTW_LIBRARY_DIR "${FFTW_LIBRARY}" PATH)
+	set(FFTW_LPATH "${FFTW_LIBRARY_DIR}" CACHE PATH "The path to fftw's library directory.") # Library path
+
+
+	# Check if we have everything we need
+	if(FFTW_IPATH AND FFTW_LPATH)
+		set(HAVE_FFTW TRUE)
+	endif()
+
+	unset(FFTW_LIBRARY_DIR)
+	unset(FFTW_LIBRARY CACHE)
+	mark_as_advanced(FFTW_IPATH)
+	mark_as_advanced(FFTW_LPATH)
+	mark_as_advanced(FFTW_FFTWF_LIBRARY)
+	mark_as_advanced(FFTW_FFTWL_LIBRARY)
+endif()

cmake/modules/FindTar.cmake

@@ -1,12 +1,14 @@
 # Filename: FindTar.cmake
 # Author: kestred (29 Nov, 2013)
 #
-# Once done this will define
+# Usage:
+#   find_package(Tar [REQUIRED] [QUIET])
 #
-#  HAVE_TAR - system has libtar
-#  TAR_IPATH - the tar include directory
-#  TAR_LPATH - the tar library directory
-#  TAR_LIBS - the tar components found
+# It sets the following variables:
+#   HAVE_TAR  - system has libtar
+#   TAR_IPATH - the tar include directory
+#   TAR_LPATH - the tar library directory
+#   TAR_LIBS  - the tar components found
 #
 
 if(TAR_IPATH AND TAR_LPATH)
@@ -33,15 +35,12 @@ else()
 	get_filename_component(TAR_LIBRARY_DIR "${TAR_LIBRARY}" PATH)
 	set(TAR_LPATH "${TAR_LIBRARY_DIR}" CACHE PATH "The path to libtar's library directory.") # Library path
 
+	# Check if we have everything we need
 	if(TAR_IPATH AND TAR_LPATH)
 		set(HAVE_TAR TRUE)
 		set(TAR_LIBS tar)
-		message("BAR")
 	endif()
 
-	#include(FindPackageHandleStandardArgs)
-	#find_package_handle_standard_args(Tar DEFAULT_MSG TAR_IPATH)
-
 	unset(TAR_LIBRARY_DIR)
 	unset(TAR_LIBRARY CACHE)
 	mark_as_advanced(TAR_IPATH)

dtool/Configure.cmake

@@ -5,21 +5,21 @@ message("Configuring support for the following optional third-party packages:")
 # Check for and configure Eigen library
 find_package(Eigen3)
 if(HAVE_EIGEN)
-    message(STATUS "+ Eigen linear algebra library")
-    if(WIN32)
-        set(EIGEN_CFLAGS "/arch:SSE2")
-    else()
-        set(EIGEN_CFLAGS "-msse2")
-    endif()
+	message(STATUS "+ Eigen linear algebra library")
+	if(WIN32)
+		set(EIGEN_CFLAGS "/arch:SSE2")
+	else()
+		set(EIGEN_CFLAGS "-msse2")
+	endif()
 
-    set(LINMATH_ALIGN ON CACHE BOOL "If on, vectorization is enabled in build.")
-    if(LINMATH_ALIGN)
-        message(STATUS "+   (vectorization enabled in build)")
-    else()
-        message(STATUS "-   (vectorization NOT enabled in build)")
-    endif()
+	set(LINMATH_ALIGN ON CACHE BOOL "If on, vectorization is enabled in build.")
+	if(LINMATH_ALIGN)
+		message(STATUS "+   (vectorization enabled in build)")
+	else()
+		message(STATUS "-   (vectorization NOT enabled in build)")
+	endif()
 else()
-    message(STATUS "- Did not find Eigen linear algebra library")
+	message(STATUS "- Did not find Eigen linear algebra library")
 endif()
 
 
@@ -28,15 +28,15 @@ endif()
 find_package(OpenSSL QUIET COMPONENTS ssl crypto)
 include(MangleOpenSSL)
 if(HAVE_OPENSSL)
-    message(STATUS "+ OpenSSL")
+	message(STATUS "+ OpenSSL")
 
-    if(NOT DEFINED OPTIMIZE OR OPTIMIZE LESS 4)
-        set(REPORT_OPENSSL_ERRORS ON CACHE BOOL "If on, OpenSSL reports verbose error messages when they occur.")
-    else()
-        set(REPORT_OPENSSL_ERRORS OFF CACHE BOOL "If on, OpenSSL reports verbose error messages when they occur.")
-    endif()
+	if(NOT DEFINED OPTIMIZE OR OPTIMIZE LESS 4)
+		set(REPORT_OPENSSL_ERRORS ON CACHE BOOL "If on, OpenSSL reports verbose error messages when they occur.")
+	else()
+		set(REPORT_OPENSSL_ERRORS OFF CACHE BOOL "If on, OpenSSL reports verbose error messages when they occur.")
+	endif()
 else()
-    message(STATUS "- Did not find OpenSSL")
+	message(STATUS "- Did not find OpenSSL")
 endif()
 
 
@@ -45,11 +45,11 @@ endif()
 find_package(JPEG QUIET COMPONENTS jpeg)
 include(MangleJPEG)
 if(HAVE_JPEG)
-    message(STATUS "+ libjpeg")
-    set(PHAVE_JPEGINT_H TRUE CACHE BOOL "Set to False if missing jpegint.h.")
+	message(STATUS "+ libjpeg")
+	set(PHAVE_JPEGINT_H TRUE CACHE BOOL "Set to False if missing jpegint.h.")
 else()
-    message(STATUS "- Did not find libjpeg")
-    unset(PHAVE_JPEGINT_H CACHE)
+	message(STATUS "- Did not find libjpeg")
+	unset(PHAVE_JPEGINT_H CACHE)
 endif()
 
 
@@ -58,9 +58,9 @@ endif()
 find_package(PNG QUIET COMPONENTS png)
 include(ManglePNG)
 if(HAVE_PNG)
-    message(STATUS "+ libpng")
+	message(STATUS "+ libpng")
 else()
-    message(STATUS "- Did not find libpng")
+	message(STATUS "- Did not find libpng")
 endif()
 
 
@@ -69,164 +69,165 @@ endif()
 find_package(TIFF QUIET COMPONENTS tiff z)
 include(MangleTIFF)
 if(HAVE_TIFF)
-    message(STATUS "+ libtiff")
+	message(STATUS "+ libtiff")
 else()
-    message(STATUS "- Did not find libtiff")
+	message(STATUS "- Did not find libtiff")
 endif()
 
 
-# Check for and configure TAR library
+# Check for and configure Tar library
 find_package(Tar)
 if(HAVE_TAR)
-    message(STATUS "+ libtar")
+	message(STATUS "+ libtar")
 else()
-    message(STATUS "- Did not find libtar")
+	message(STATUS "- Did not find libtar")
 endif()
 
 
-
+# Check for and configure FFTW library
+find_package(FFTW)
 if(HAVE_FFTW)
-    message(STATUS "+ fftw")
+	message(STATUS "+ fftw")
 else()
-    message(STATUS "- Did not find fftw")
+	message(STATUS "- Did not find fftw")
 endif()
 
 if(HAVE_SQUISH)
-    message(STATUS "+ squish")
+	message(STATUS "+ squish")
 else()
-    message(STATUS "- Did not find squish")
+	message(STATUS "- Did not find squish")
 endif()
 
 if(HAVE_CG)
-    message(STATUS "+ Nvidia Cg High Level Shading Language")
+	message(STATUS "+ Nvidia Cg High Level Shading Language")
 else()
-    message(STATUS "- Did not find Nvidia Cg High Level Shading Language")
+	message(STATUS "- Did not find Nvidia Cg High Level Shading Language")
 endif()
 
 if(HAVE_CGGL)
-    message(STATUS "+ Cg OpenGL API")
+	message(STATUS "+ Cg OpenGL API")
 else()
-    message(STATUS "- Did not find Cg OpenGL API")
+	message(STATUS "- Did not find Cg OpenGL API")
 endif()
 
 if(HAVE_CGDX8)
-    message(STATUS "+ Cg DX8 API")
+	message(STATUS "+ Cg DX8 API")
 else()
-    message(STATUS "- Did not find Cg DX8 API")
+	message(STATUS "- Did not find Cg DX8 API")
 endif()
 
 if(HAVE_CGDX9)
-    message(STATUS "+ Cg DX9 API")
+	message(STATUS "+ Cg DX9 API")
 else()
-    message(STATUS "- Did not find Cg DX9 API")
+	message(STATUS "- Did not find Cg DX9 API")
 endif()
 
 if(HAVE_CGDX10)
-    message(STATUS "+ Cg DX10 API")
+	message(STATUS "+ Cg DX10 API")
 else()
-    message(STATUS "- Did not find Cg DX10 API")
+	message(STATUS "- Did not find Cg DX10 API")
 endif()
 
 if(HAVE_VRPN)
-    message(STATUS "+ VRPN")
+	message(STATUS "+ VRPN")
 else()
-    message(STATUS "- Did not find VRPN")
+	message(STATUS "- Did not find VRPN")
 endif()
 
 if(HAVE_ZLIB)
-    message(STATUS "+ zlib")
+	message(STATUS "+ zlib")
 else()
-    message(STATUS "- Did not find zlib")
+	message(STATUS "- Did not find zlib")
 endif()
 
 if(HAVE_RAD_MSS)
-    message(STATUS "+ Miles Sound System")
+	message(STATUS "+ Miles Sound System")
 else()
-    message(STATUS "- Did not find Miles Sound System")
+	message(STATUS "- Did not find Miles Sound System")
 endif()
 
 if(HAVE_FMODEX)
-    message(STATUS "+ FMOD Ex sound library")
+	message(STATUS "+ FMOD Ex sound library")
 else()
-    message(STATUS "- Did not find FMOD Ex sound library")
+	message(STATUS "- Did not find FMOD Ex sound library")
 endif()
 
 if(HAVE_OPENAL)
-    message(STATUS "+ OpenAL sound library")
+	message(STATUS "+ OpenAL sound library")
 else()
-    message(STATUS "- Did not find OpenAL sound library")
+	message(STATUS "- Did not find OpenAL sound library")
 endif()
 
 if(HAVE_PHYSX)
-    message(STATUS "+ Ageia PhysX")
+	message(STATUS "+ Ageia PhysX")
 else()
-    message(STATUS "- Did not find Ageia PhysX")
+	message(STATUS "- Did not find Ageia PhysX")
 endif()
 
 if(HAVE_SPEEDTREE)
-    message(STATUS "+ SpeedTree")
+	message(STATUS "+ SpeedTree")
 else()
-    message(STATUS "- Did not find SpeedTree")
+	message(STATUS "- Did not find SpeedTree")
 endif()
 
 if(HAVE_GTK)
-    message(STATUS "+ gtk+-2")
+	message(STATUS "+ gtk+-2")
 else()
-    message(STATUS "- Did not find gtk+-2")
+	message(STATUS "- Did not find gtk+-2")
 endif()
 
 if(HAVE_FREETYPE)
-    message(STATUS "+ Freetype")
+	message(STATUS "+ Freetype")
 else()
-    message(STATUS "- Did not find Freetype")
+	message(STATUS "- Did not find Freetype")
 endif()
 
 if(HAVE_WX)
-    message(STATUS "+ WxWidgets")
+	message(STATUS "+ WxWidgets")
 else()
-    message(STATUS "- Did not find WxWidgets")
+	message(STATUS "- Did not find WxWidgets")
 endif()
 
 if(HAVE_FLTK)
-    message(STATUS "+ FLTK")
+	message(STATUS "+ FLTK")
 else()
-    message(STATUS "- Did not find FLTK")
+	message(STATUS "- Did not find FLTK")
 endif()
 
 if(HAVE_GL)
-    message(STATUS "+ OpenGL")
+	message(STATUS "+ OpenGL")
 else()
-    message(STATUS "- Did not find OpenGL")
+	message(STATUS "- Did not find OpenGL")
 endif()
 
 if(HAVE_GLES)
-    message(STATUS "+ OpenGL ES 1")
+	message(STATUS "+ OpenGL ES 1")
 else()
-    message(STATUS "- Did not find OpenGL ES 1")
+	message(STATUS "- Did not find OpenGL ES 1")
 endif()
 
 if(HAVE_GLES2)
-    message(STATUS "+ OpenGL ES 2")
+	message(STATUS "+ OpenGL ES 2")
 else()
-    message(STATUS "- Did not find OpenGL ES 2")
+	message(STATUS "- Did not find OpenGL ES 2")
 endif()
 
 if(HAVE_DX8)
-    message(STATUS "+ DirectX8")
+	message(STATUS "+ DirectX8")
 else()
-    message(STATUS "- Did not find DirectX8")
+	message(STATUS "- Did not find DirectX8")
 endif()
 
 if(HAVE_DX9)
-    message(STATUS "+ DirectX9")
+	message(STATUS "+ DirectX9")
 else()
-    message(STATUS "- Did not find DirectX9")
+	message(STATUS "- Did not find DirectX9")
 endif()
 
 if(HAVE_TINYDISPLAY)
-    message(STATUS "+ Tinydisplay")
+	message(STATUS "+ Tinydisplay")
 else()
-    message(STATUS "- Not building Tinydisplay")
+	message(STATUS "- Not building Tinydisplay")
 endif()
 
 # if(HAVE_SDL)
@@ -236,120 +237,120 @@ endif()
 # endif()
 
 if(HAVE_X11)
-    message(STATUS "+ X11")
+	message(STATUS "+ X11")
 else()
-    message(STATUS "- Did not find X11")
+	message(STATUS "- Did not find X11")
 endif()
 
 if(HAVE_MESA)
-    message(STATUS "+ Mesa")
+	message(STATUS "+ Mesa")
 else()
-    message(STATUS "- Did not find Mesa")
+	message(STATUS "- Did not find Mesa")
 endif()
 
 if(HAVE_OPENCV)
-    message(STATUS "+ OpenCV")
+	message(STATUS "+ OpenCV")
 else()
-    message(STATUS "- Did not find OpenCV")
+	message(STATUS "- Did not find OpenCV")
 endif()
 
 if(HAVE_FFMPEG)
-    message(STATUS "+ FFMPEG")
+	message(STATUS "+ FFMPEG")
 else()
-    message(STATUS "- Did not find FFMPEG")
+	message(STATUS "- Did not find FFMPEG")
 endif()
 
 if(HAVE_ODE)
-    message(STATUS "+ ODE")
+	message(STATUS "+ ODE")
 else()
-    message(STATUS "- Did not find ODE")
+	message(STATUS "- Did not find ODE")
 endif()
 
 if(HAVE_AWESOMIUM)
-    message(STATUS "+ AWESOMIUM")
+	message(STATUS "+ AWESOMIUM")
 else()
-    message(STATUS "- Did not find AWESOMIUM")
+	message(STATUS "- Did not find AWESOMIUM")
 endif()
 
 if(HAVE_MAYA)
-    message(STATUS "+ OpenMaya")
+	message(STATUS "+ OpenMaya")
 else()
-    message(STATUS "- Did not find OpenMaya")
+	message(STATUS "- Did not find OpenMaya")
 endif()
 
 if(HAVE_FCOLLADA)
-    message(STATUS "+ FCollada")
+	message(STATUS "+ FCollada")
 else()
-    message(STATUS "- Did not find FCollada")
+	message(STATUS "- Did not find FCollada")
 endif()
 
 if(HAVE_COLLADA14DOM OR HAVE_COLLADA15DOM)
-    message(STATUS "+ COLLADA DOM")
+	message(STATUS "+ COLLADA DOM")
 else()
-    message(STATUS "- Did not find COLLADA DOM")
+	message(STATUS "- Did not find COLLADA DOM")
 endif()
 
 if(HAVE_ASSIMP)
-    message(STATUS "+ Assimp")
+	message(STATUS "+ Assimp")
 else()
-    message(STATUS "- Did not find Assimp")
+	message(STATUS "- Did not find Assimp")
 endif()
 
 if(HAVE_ARTOOLKIT)
-    message(STATUS "+ ARToolKit")
+	message(STATUS "+ ARToolKit")
 else()
-    message(STATUS "- Did not find ARToolKit")
+	message(STATUS "- Did not find ARToolKit")
 endif()
 
 if(HAVE_ROCKET)
-    if(HAVE_ROCKET_PYTHON)
-        message(STATUS "+ libRocket with Python bindings")
-    else()
-        message(STATUS "+ libRocket without Python bindings")
-    endif()
+	if(HAVE_ROCKET_PYTHON)
+		message(STATUS "+ libRocket with Python bindings")
+	else()
+		message(STATUS "+ libRocket without Python bindings")
+	endif()
 else()
-    message(STATUS "- Did not find libRocket")
+	message(STATUS "- Did not find libRocket")
 endif()
 
 if(HAVE_BULLET)
-    message(STATUS "+ Bullet Physics")
+	message(STATUS "+ Bullet Physics")
 else()
-    message(STATUS "- Did not find Bullet Physics")
+	message(STATUS "- Did not find Bullet Physics")
 endif()
 
 if(HAVE_VORBIS)
-    message(STATUS "+ libvorbis (Ogg Vorbis Decoder)")
+	message(STATUS "+ libvorbis (Ogg Vorbis Decoder)")
 else()
-    message(STATUS "- Did not find libvorbis (Ogg Vorbis Decoder)")
+	message(STATUS "- Did not find libvorbis (Ogg Vorbis Decoder)")
 endif()
 
 message(STATUS "")
 if(HAVE_INTERROGATE AND HAVE_PYTHON)
-    message(STATUS "Compilation will generate Python interfaces.")
+	message(STATUS "Compilation will generate Python interfaces.")
 else()
-    message(STATUS "Configuring Panda without Python interfaces.")
+	message(STATUS "Configuring Panda without Python interfaces.")
 endif()
 
 if(HAVE_THREADS)
-    if(SIMPLE_THREADS)
-        message(STATUS "Compilation will include simulated threading support.")
-    else()
-        if(DO_PIPELINING)
-            message(STATUS "Compilation will include full, pipelined threading support.")
-        else()
-            message(STATUS "Compilation will include nonpipelined threading support.")
-        endif()
-    endif()
+	if(SIMPLE_THREADS)
+		message(STATUS "Compilation will include simulated threading support.")
+	else()
+		if(DO_PIPELINING)
+			message(STATUS "Compilation will include full, pipelined threading support.")
+		else()
+			message(STATUS "Compilation will include nonpipelined threading support.")
+		endif()
+	endif()
 else()
-    message(STATUS "Configuring Panda without threading support.")
+	message(STATUS "Configuring Panda without threading support.")
 endif()
 
 if(OSX_PLATFORM)
-    if(UNIVERSAL_BINARIES)
-        message(STATUS "Compilation will create universal binaries.")
-    else()
-        message(STATUS "Compilation will not create universal binaries.")
-    endif()
+	if(UNIVERSAL_BINARIES)
+		message(STATUS "Compilation will create universal binaries.")
+	else()
+		message(STATUS "Compilation will not create universal binaries.")
+	endif()
 endif()
 
 message(STATUS "")