CMake: Modify Find*.cmake to trust find_*()'s caching

cmake/modules/FindARToolKit.cmake

@@ -10,25 +10,15 @@
 #   ARTOOLKIT_LIBRARIES   - the paths to the ARToolKit client libraries
 #
 
-if(NOT ARTOOLKIT_INCLUDE_DIR)
-  find_path(ARTOOLKIT_INCLUDE_DIR "AR/ar.h")
+find_path(ARTOOLKIT_INCLUDE_DIR "AR/ar.h")
 
-  mark_as_advanced(ARTOOLKIT_INCLUDE_DIR)
-endif()
-
-if(NOT ARTOOLKIT_AR_LIBRARY)
-  find_library(ARTOOLKIT_AR_LIBRARY
-    NAMES "AR" "libAR")
+find_library(ARTOOLKIT_AR_LIBRARY
+  NAMES "AR" "libAR")
 
-  mark_as_advanced(ARTOOLKIT_AR_LIBRARY)
-endif()
+find_library(ARTOOLKIT_ARMulti_LIBRARY
+  NAMES "ARMulti" "libARMulti")
 
-if(NOT ARTOOLKIT_ARMulti_LIBRARY)
-  find_library(ARTOOLKIT_ARMulti_LIBRARY
-    NAMES "ARMulti" "libARMulti")
-
-  mark_as_advanced(ARTOOLKIT_ARMulti_LIBRARY)
-endif()
+mark_as_advanced(ARTOOLKIT_INCLUDE_DIR ARTOOLKIT_AR_LIBRARY ARTOOLKIT_ARMulti_LIBRARY)
 
 set(ARTOOLKIT_LIBRARIES)
 if(ARTOOLKIT_AR_LIBRARY)

cmake/modules/FindAssimp.cmake

@@ -10,19 +10,13 @@
 #   ASSIMP_LIBRARY      - the library to link against for Assimp
 #
 
-if(NOT ASSIMP_INCLUDE_DIR)
-  find_path(ASSIMP_INCLUDE_DIR
-    NAMES "assimp/Importer.hpp")
+find_path(ASSIMP_INCLUDE_DIR
+  NAMES "assimp/Importer.hpp")
 
-  mark_as_advanced(ASSIMP_INCLUDE_DIR)
-endif()
+find_library(ASSIMP_LIBRARY
+  NAMES "assimp")
 
-if(NOT ASSIMP_LIBRARY)
-  find_library(ASSIMP_LIBRARY
-    NAMES "assimp")
-
-  mark_as_advanced(ASSIMP_LIBRARY)
-endif()
+mark_as_advanced(ASSIMP_INCLUDE_DIR ASSIMP_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Assimp DEFAULT_MSG ASSIMP_INCLUDE_DIR ASSIMP_LIBRARY)

cmake/modules/FindEGL.cmake

@@ -10,18 +10,12 @@
 #   EGL_LIBRARY      - the library to link against for EGL
 #
 
-if(NOT EGL_INCLUDE_DIR)
-  find_path(EGL_INCLUDE_DIR "EGL/egl.h")
+find_path(EGL_INCLUDE_DIR "EGL/egl.h")
 
-  mark_as_advanced(EGL_INCLUDE_DIR)
-endif()
+find_library(EGL_LIBRARY
+  NAMES "EGL")
 
-if(NOT EGL_LIBRARY)
-  find_library(EGL_LIBRARY
-    NAMES "EGL")
-
-  mark_as_advanced(EGL_LIBRARY)
-endif()
+mark_as_advanced(EGL_INCLUDE_DIR EGL_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(EGL DEFAULT_MSG EGL_INCLUDE_DIR EGL_LIBRARY)

cmake/modules/FindEigen3.cmake

@@ -10,13 +10,11 @@
 #   EIGEN3_INCLUDE_DIR - the Eigen3 include directory
 #
 
-if(NOT EIGEN3_INCLUDE_DIR)
-  find_path(EIGEN3_INCLUDE_DIR
-    NAMES signature_of_eigen3_matrix_library
-    PATH_SUFFIXES eigen3 eigen)
+find_path(EIGEN3_INCLUDE_DIR
+  NAMES signature_of_eigen3_matrix_library
+  PATH_SUFFIXES eigen3 eigen)
 
-  mark_as_advanced(EIGEN3_INCLUDE_DIR)
-endif()
+mark_as_advanced(EIGEN3_INCLUDE_DIR)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Eigen3 DEFAULT_MSG EIGEN3_INCLUDE_DIR)

cmake/modules/FindFFMPEG.cmake

@@ -14,60 +14,58 @@
 #   FFMPEG_LIBAVUTIL   - the path to the libavutil library binary
 #
 
-if(NOT FFMPEG_INCLUDE_DIR OR NOT FFMPEG_LIBRARY_DIR)
-	# Find the libffmpeg include files
-	find_path(FFMPEG_INCLUDE_DIR
-		NAMES "libavcodec/avcodec.h"
-		PATHS "/usr/include"
-		      "/usr/local/include"
-		      "/sw/include"
-		      "/opt/include"
-		      "/opt/local/include"
-		      "/opt/csw/include"
-		PATH_SUFFIXES "libav" "ffmpeg"
-	)
+# Find the libffmpeg include files
+find_path(FFMPEG_INCLUDE_DIR
+  NAMES "libavcodec/avcodec.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/sw/include"
+        "/opt/include"
+        "/opt/local/include"
+        "/opt/csw/include"
+  PATH_SUFFIXES "libav" "ffmpeg"
+)
 
-	# Find the libavcodec library
-  find_library(FFMPEG_LIBAVCODEC
-		NAMES "avcodec"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libavcodec library
+find_library(FFMPEG_LIBAVCODEC
+  NAMES "avcodec"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	# Find the libavformat library
-  find_library(FFMPEG_LIBAVFORMAT
-		NAMES "avformat"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libavformat library
+find_library(FFMPEG_LIBAVFORMAT
+  NAMES "avformat"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	# Find the libavutil library
-  find_library(FFMPEG_LIBAVUTIL
-		NAMES "avutil"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libavutil library
+find_library(FFMPEG_LIBAVUTIL
+  NAMES "avutil"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	mark_as_advanced(FFMPEG_INCLUDE_DIR)
-  mark_as_advanced(FFMPEG_LIBAVCODEC)
-  mark_as_advanced(FFMPEG_LIBAVFORMAT)
-  mark_as_advanced(FFMPEG_LIBAVUTIL)
-endif()
+mark_as_advanced(FFMPEG_INCLUDE_DIR)
+mark_as_advanced(FFMPEG_LIBAVCODEC)
+mark_as_advanced(FFMPEG_LIBAVFORMAT)
+mark_as_advanced(FFMPEG_LIBAVUTIL)
 
 # Translate library into library directory
 if(FFMPEG_LIBAVCODEC)

cmake/modules/FindFFTW3.cmake

@@ -14,96 +14,94 @@
 #   FFTW3_ROOT - if set, the libraries are exclusively searched under this path
 #
 
-if(NOT FFTW3_INCLUDE_DIR OR NOT FFTW3_LIBRARY_DIR)
-  # Check if we can use PkgConfig
-  find_package(PkgConfig QUIET)
+# Check if we can use PkgConfig
+find_package(PkgConfig QUIET)
 
-  #Determine from PKG
-  if(PKG_CONFIG_FOUND AND NOT FFTW3_ROOT)
-    pkg_check_modules(PKG_FFTW QUIET "fftw3")
-  endif()
+#Determine from PKG
+if(PKG_CONFIG_FOUND AND NOT FFTW3_ROOT)
+  pkg_check_modules(PKG_FFTW QUIET "fftw3")
+endif()
 
-  if(FFTW3_ROOT)
-    # Try to find headers under root
-    find_path(FFTW3_INCLUDE_DIR
-      NAMES "fftw3.h"
-      PATHS ${FFTW3_ROOT}
-      PATH_SUFFIXES "include"
-      NO_DEFAULT_PATH
-    )
+if(FFTW3_ROOT)
+  # Try to find headers under root
+  find_path(FFTW3_INCLUDE_DIR
+    NAMES "fftw3.h"
+    PATHS ${FFTW3_ROOT}
+    PATH_SUFFIXES "include"
+    NO_DEFAULT_PATH
+  )
 
-    # Try to find library under root
-    find_library(FFTW3_LIBRARY
-      NAMES "fftw3"
-      PATHS ${FFTW3_ROOT}
-      PATH_SUFFIXES "lib" "lib64"
-      NO_DEFAULT_PATH
-    )
+  # Try to find library under root
+  find_library(FFTW3_LIBRARY
+    NAMES "fftw3"
+    PATHS ${FFTW3_ROOT}
+    PATH_SUFFIXES "lib" "lib64"
+    NO_DEFAULT_PATH
+  )
 
-    find_library(FFTW3_FFTWF_LIBRARY
-      NAMES "fftw3f"
-      PATHS ${FFTW3_ROOT}
-      PATH_SUFFIXES "lib" "lib64"
-      NO_DEFAULT_PATH
-    )
+  find_library(FFTW3_FFTWF_LIBRARY
+    NAMES "fftw3f"
+    PATHS ${FFTW3_ROOT}
+    PATH_SUFFIXES "lib" "lib64"
+    NO_DEFAULT_PATH
+  )
 
-    find_library(FFTW3_FFTWL_LIBRARY
-      NAMES "fftw3l"
-      PATHS ${FFTW3_ROOT}
-      PATH_SUFFIXES "lib" "lib64"
-      NO_DEFAULT_PATH
-    )
-  else()
-    # Find headers the normal way
-    find_path(FFTW3_INCLUDE_DIR
-      NAMES "fftw3.h"
-      PATHS ${PKG_FFTW3_INCLUDE_DIRS}
-            ${INCLUDE_INSTALL_DIR}
-            "/usr/include"
-            "/usr/local/include"
-      PATH_SUFFIXES "" "fftw"
-    )
+  find_library(FFTW3_FFTWL_LIBRARY
+    NAMES "fftw3l"
+    PATHS ${FFTW3_ROOT}
+    PATH_SUFFIXES "lib" "lib64"
+    NO_DEFAULT_PATH
+  )
+else()
+  # Find headers the normal way
+  find_path(FFTW3_INCLUDE_DIR
+    NAMES "fftw3.h"
+    PATHS ${PKG_FFTW3_INCLUDE_DIRS}
+          ${INCLUDE_INSTALL_DIR}
+          "/usr/include"
+          "/usr/local/include"
+    PATH_SUFFIXES "" "fftw"
+  )
 
-    # Find library the normal way
-    find_library(FFTW3_LIBRARY
-      NAMES "fftw3"
-      PATHS ${PKG_FFTW3_LIBRARY_DIRS}
-            ${LIB_INSTALL_DIR}
-            "/usr"
-            "/usr/local"
-      PATH_SUFFIXES "" "lib" "lib32" "lib64"
-    )
+  # Find library the normal way
+  find_library(FFTW3_LIBRARY
+    NAMES "fftw3"
+    PATHS ${PKG_FFTW3_LIBRARY_DIRS}
+          ${LIB_INSTALL_DIR}
+          "/usr"
+          "/usr/local"
+    PATH_SUFFIXES "" "lib" "lib32" "lib64"
+  )
 
-    find_library(FFTW3_FFTWF_LIBRARY
-      NAMES "fftw3f"
-      PATHS ${PKG_FFTW3_LIBRARY_DIRS}
-            ${LIB_INSTALL_DIR}
-            "/usr"
-            "/usr/local"
-      PATH_SUFFIXES "" "lib" "lib32" "lib64"
-    )
+  find_library(FFTW3_FFTWF_LIBRARY
+    NAMES "fftw3f"
+    PATHS ${PKG_FFTW3_LIBRARY_DIRS}
+          ${LIB_INSTALL_DIR}
+          "/usr"
+          "/usr/local"
+    PATH_SUFFIXES "" "lib" "lib32" "lib64"
+  )
 
 
-    find_library(FFTW3_FFTWL_LIBRARY
-      NAMES "fftw3l"
-      PATHS ${PKG_FFTW3_LIBRARY_DIRS}
-            ${LIB_INSTALL_DIR}
-            "/usr"
-            "/usr/local"
-      PATH_SUFFIXES "" "lib" "lib32" "lib64"
-    )
-  endif()
+  find_library(FFTW3_FFTWL_LIBRARY
+    NAMES "fftw3l"
+    PATHS ${PKG_FFTW3_LIBRARY_DIRS}
+          ${LIB_INSTALL_DIR}
+          "/usr"
+          "/usr/local"
+    PATH_SUFFIXES "" "lib" "lib32" "lib64"
+  )
+endif()
 
-  # Get the directory conaining FFTW3_LIBRARY
-  get_filename_component(FFTW3_LIBRARY_DIR "${FFTW3_LIBRARY}" PATH)
-  set(FFTW3_LIBRARY_DIR "${FFTW3_LIBRARY_DIR}" CACHE PATH "The path to fftw's library directory.") # Library path
+# Get the directory conaining FFTW3_LIBRARY
+get_filename_component(FFTW3_LIBRARY_DIR "${FFTW3_LIBRARY}" PATH)
+set(FFTW3_LIBRARY_DIR "${FFTW3_LIBRARY_DIR}" CACHE PATH "The path to fftw's library directory.") # Library path
 
-  mark_as_advanced(FFTW3_INCLUDE_DIR)
-  mark_as_advanced(FFTW3_LIBRARY_DIR)
-  mark_as_advanced(FFTW3_LIBRARY)
-  mark_as_advanced(FFTW3_FFTWF_LIBRARY)
-  mark_as_advanced(FFTW3_FFTWL_LIBRARY)
-endif()
+mark_as_advanced(FFTW3_INCLUDE_DIR)
+mark_as_advanced(FFTW3_LIBRARY_DIR)
+mark_as_advanced(FFTW3_LIBRARY)
+mark_as_advanced(FFTW3_FFTWF_LIBRARY)
+mark_as_advanced(FFTW3_FFTWL_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(FFTW3 DEFAULT_MSG FFTW3_LIBRARY FFTW3_INCLUDE_DIR FFTW3_LIBRARY_DIR)

cmake/modules/FindFMODEx.cmake

@@ -14,72 +14,70 @@
 #   FMOXEX_64_LIBRARY - the filepath of the Miles SDK 64-bit library
 #
 
-if(NOT FMODEX_LIBRARY_DIR OR NOT FMODEX_INCLUDE_DIR)
-  # Find the include directory
-  find_path(FMODEX_INCLUDE_DIR
-    NAMES "fmod.h"
-    PATHS "/usr/include"
-          "/usr/local/include"
-          "/sw/include"
-          "/opt/include"
-          "/opt/local/include"
-          "/opt/csw/include"
-          "/opt/fmodex/include"
-          "/opt/fmodex/api/inc"
-          "C:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API Win32/api/inc"
-    PATH_SUFFIXES "" "fmodex/fmod" "fmodex/fmod3" "fmod" "fmod3"
-    DOC "The path to FMOD Ex's include directory."
-  )
+# Find the include directory
+find_path(FMODEX_INCLUDE_DIR
+  NAMES "fmod.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/sw/include"
+        "/opt/include"
+        "/opt/local/include"
+        "/opt/csw/include"
+        "/opt/fmodex/include"
+        "/opt/fmodex/api/inc"
+        "C:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API Win32/api/inc"
+  PATH_SUFFIXES "" "fmodex/fmod" "fmodex/fmod3" "fmod" "fmod3"
+  DOC "The path to FMOD Ex's include directory."
+)
 
-  # Find the 32-bit library
-  find_library(FMODEX_32_LIBRARY
-    NAMES "fmodex_vc" "fmodex_bc" "fmodex" "fmodexL" "libfmodex" "libfmodexL"
-    PATHS "/usr"
-          "/usr/local"
-          "/usr/X11R6"
-          "/usr/local/X11R6"
-          "/sw"
-          "/opt"
-          "/opt/local"
-          "/opt/csw"
-          "/opt/fmodex"
-          "/opt/fmodex/api"
-          "C:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API Win32/api/lib"
-    PATH_SUFFIXES "" "lib" "lib32"
-  )
+# Find the 32-bit library
+find_library(FMODEX_32_LIBRARY
+  NAMES "fmodex_vc" "fmodex_bc" "fmodex" "fmodexL" "libfmodex" "libfmodexL"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/X11R6"
+        "/usr/local/X11R6"
+        "/sw"
+        "/opt"
+        "/opt/local"
+        "/opt/csw"
+        "/opt/fmodex"
+        "/opt/fmodex/api"
+        "C:/Program Files (x86)/FMOD SoundSystem/FMOD Programmers API Win32/api/lib"
+  PATH_SUFFIXES "" "lib" "lib32"
+)
 
-  # Find the 64-bit library
-  find_library(FMODEX_64_LIBRARY
-    NAMES "fmodex64" "libfmodex64" "fmodexL64" "libfmodexL64"
-    PATHS "/usr"
-          "/usr/local"
-          "/usr/X11R6"
-          "/usr/local/X11R6"
-          "/sw"
-          "/opt"
-          "/opt/local"
-          "/opt/csw"
-          "/opt/fmodex"
-          "/opt/fmodex/api"
-          "/usr/freeware"
-    PATH_SUFFIXES "" "lib" "lib64"
-  )
+# Find the 64-bit library
+find_library(FMODEX_64_LIBRARY
+  NAMES "fmodex64" "libfmodex64" "fmodexL64" "libfmodexL64"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/X11R6"
+        "/usr/local/X11R6"
+        "/sw"
+        "/opt"
+        "/opt/local"
+        "/opt/csw"
+        "/opt/fmodex"
+        "/opt/fmodex/api"
+        "/usr/freeware"
+  PATH_SUFFIXES "" "lib" "lib64"
+)
 
-  if(FMODEX_32_LIBRARY)
-    set(FMODEX_LIBRARY ${FMODEX_32_LIBRARY} CACHE FILEPATH "The filepath to FMOD Ex's library binary.")
-  elseif(FMODEX_64_LIBRARY)
-    set(FMODEX_LIBRARY ${FMODEX_64_LIBRARY} CACHE FILEPATH "The filepath to FMOD Ex's library binary.")
-  endif()
+if(FMODEX_32_LIBRARY)
+  set(FMODEX_LIBRARY ${FMODEX_32_LIBRARY} CACHE FILEPATH "The filepath to FMOD Ex's library binary.")
+elseif(FMODEX_64_LIBRARY)
+  set(FMODEX_LIBRARY ${FMODEX_64_LIBRARY} CACHE FILEPATH "The filepath to FMOD Ex's library binary.")
+endif()
 
-  get_filename_component(FMODEX_LIBRARY_DIR "${FMODEX_LIBRARY}" PATH)
-  set(FMODEX_LIBRARY_DIR "${FMODEX_LIBRARY_DIR}" CACHE PATH "The path to FMOD Ex's library directory.")
+get_filename_component(FMODEX_LIBRARY_DIR "${FMODEX_LIBRARY}" PATH)
+set(FMODEX_LIBRARY_DIR "${FMODEX_LIBRARY_DIR}" CACHE PATH "The path to FMOD Ex's library directory.")
 
-  mark_as_advanced(FMODEX_INCLUDE_DIR)
-  mark_as_advanced(FMODEX_LIBRARY_DIR)
-  mark_as_advanced(FMODEX_LIBRARY)
-  mark_as_advanced(FMODEX_32_LIBRARY)
-  mark_as_advanced(FMODEX_64_LIBRARY)
-endif()
+mark_as_advanced(FMODEX_INCLUDE_DIR)
+mark_as_advanced(FMODEX_LIBRARY_DIR)
+mark_as_advanced(FMODEX_LIBRARY)
+mark_as_advanced(FMODEX_32_LIBRARY)
+mark_as_advanced(FMODEX_64_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(FMODEx DEFAULT_MSG FMODEX_LIBRARY FMODEX_INCLUDE_DIR FMODEX_LIBRARY_DIR)

cmake/modules/FindHarfBuzz.cmake

@@ -10,20 +10,14 @@
 #   HARFBUZZ_LIBRARY     - the path to the HarfBuzz library
 #
 
-if(NOT HARFBUZZ_INCLUDE_DIR)
-  find_path(HARFBUZZ_INCLUDE_DIR
-    NAMES "hb.h"
-    PATH_SUFFIXES "harfbuzz")
+find_path(HARFBUZZ_INCLUDE_DIR
+  NAMES "hb.h"
+  PATH_SUFFIXES "harfbuzz")
 
-  mark_as_advanced(HARFBUZZ_INCLUDE_DIR)
-endif()
+find_library(HARFBUZZ_LIBRARY
+  NAMES "harfbuzz")
 
-if(NOT HARFBUZZ_LIBRARY)
-  find_library(HARFBUZZ_LIBRARY
-    NAMES "harfbuzz")
-
-  mark_as_advanced(HARFBUZZ_LIBRARY)
-endif()
+mark_as_advanced(HARFBUZZ_INCLUDE_DIR HARFBUZZ_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(HarfBuzz DEFAULT_MSG HARFBUZZ_INCLUDE_DIR HARFBUZZ_LIBRARY)

cmake/modules/FindLibSquish.cmake

@@ -14,48 +14,46 @@
 #   LIBSQUISH_DEBUG_LIBRARY   - the filepath of the libsquish debug library
 #
 
-if(NOT LIBSQUISH_INCLUDE_DIR OR NOT LIBSQUISH_LIBRARY_DIR)
-	# Find the libsquish include files
-	find_path(LIBSQUISH_INCLUDE_DIR
-		NAMES "squish.h"
-		PATHS "/usr/include"
-		      "/usr/local/include"
-		      "/sw/include"
-		      "/opt/include"
-		      "/opt/local/include"
-		      "/opt/csw/include"
-		PATH_SUFFIXES "" "cppunit"
-	)
+# Find the libsquish include files
+find_path(LIBSQUISH_INCLUDE_DIR
+  NAMES "squish.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/sw/include"
+        "/opt/include"
+        "/opt/local/include"
+        "/opt/csw/include"
+  PATH_SUFFIXES "" "cppunit"
+)
 
-	# Find the libsquish library built for release
-	find_library(LIBSQUISH_RELEASE_LIBRARY
-		NAMES "squish" "libsquish"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libsquish library built for release
+find_library(LIBSQUISH_RELEASE_LIBRARY
+  NAMES "squish" "libsquish"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	# Find the libsquish library built for debug
-	find_library(LIBSQUISH_DEBUG_LIBRARY
-		NAMES "squishd" "libsquishd"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libsquish library built for debug
+find_library(LIBSQUISH_DEBUG_LIBRARY
+  NAMES "squishd" "libsquishd"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
 
-	mark_as_advanced(LIBSQUISH_INCLUDE_DIR)
-	mark_as_advanced(LIBSQUISH_RELEASE_LIBRARY)
-	mark_as_advanced(LIBSQUISH_DEBUG_LIBRARY)
-endif()
+mark_as_advanced(LIBSQUISH_INCLUDE_DIR)
+mark_as_advanced(LIBSQUISH_RELEASE_LIBRARY)
+mark_as_advanced(LIBSQUISH_DEBUG_LIBRARY)
 
 # Choose library
 if(CMAKE_BUILD_TYPE MATCHES "Debug" AND LIBSQUISH_DEBUG_LIBRARY)

cmake/modules/FindMiles.cmake

@@ -17,94 +17,92 @@
 #   MILES_DEBUG_LIBRARY   - the filepath of the Miles SDK debug library
 #
 
-if(NOT MILES_INCLUDE_DIR OR NOT MILES_LIBRARY_DIR)
-  # Find the Miles SDK include files
-  find_path(MILES_INCLUDE_DIR
-    NAMES "miles.h"
-    PATHS "/usr/include"
-          "/usr/local/include"
-          "/opt/"
-          "C:/Program Files"
-          "C:/Program Files (x86)"
-    PATH_SUFFIXES "" "miles" "Miles6" "miles/include" "Miles6/include"
-    DOC "The path to the Miles SDK include directory."
-  )
+# Find the Miles SDK include files
+find_path(MILES_INCLUDE_DIR
+  NAMES "miles.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/opt/"
+        "C:/Program Files"
+        "C:/Program Files (x86)"
+  PATH_SUFFIXES "" "miles" "Miles6" "miles/include" "Miles6/include"
+  DOC "The path to the Miles SDK include directory."
+)
 
-  # Find the Miles SDK libraries (.a, .so)
-  find_library(MILES_RELEASE_LIBRARY
-    NAMES "miles"
-    PATHS "/usr"
-          "/usr/local"
-          "/opt/miles"
-          "/opt/Miles6"
-          "C:/Program Files/miles"
-          "C:/Program Files (x86)/miles"
-          "C:/Program Files/Miles6"
-          "C:/Program Files (x86)/Miles6"
-    PATH_SUFFIXES "lib" "lib32"
-  )
-  find_library(MILES_MINSIZE_LIBRARY
-    NAMES "miles_s"
-    PATHS "/usr"
-          "/usr/local"
-          "/opt/miles"
-          "C:/Program Files/miles"
-          "C:/Program Files (x86)/miles"
-          "C:/Program Files/Miles6"
-          "C:/Program Files (x86)/Miles6"
-    PATH_SUFFIXES "lib" "lib32"
-  )
-  find_library(MILES_RELWITHDEBINFO_LIBRARY
-    NAMES "miles_rd"
-    PATHS "/usr"
-          "/usr/local"
-          "/opt/miles"
-          "C:/Program Files/miles"
-          "C:/Program Files (x86)/miles"
-          "C:/Program Files/Miles6"
-          "C:/Program Files (x86)/Miles6"
-    PATH_SUFFIXES "lib" "lib32"
-  )
-  find_library(MILES_DEBUG_LIBRARY
-    NAMES "miles_d"
-    PATHS "/usr"
-          "/usr/local"
-          "/opt/miles"
-          "C:/Program Files/miles"
-          "C:/Program Files (x86)/miles"
-          "C:/Program Files/Miles6"
-          "C:/Program Files (x86)/Miles6"
-    PATH_SUFFIXES "lib" "lib32"
-  )
+# Find the Miles SDK libraries (.a, .so)
+find_library(MILES_RELEASE_LIBRARY
+  NAMES "miles"
+  PATHS "/usr"
+        "/usr/local"
+        "/opt/miles"
+        "/opt/Miles6"
+        "C:/Program Files/miles"
+        "C:/Program Files (x86)/miles"
+        "C:/Program Files/Miles6"
+        "C:/Program Files (x86)/Miles6"
+  PATH_SUFFIXES "lib" "lib32"
+)
+find_library(MILES_MINSIZE_LIBRARY
+  NAMES "miles_s"
+  PATHS "/usr"
+        "/usr/local"
+        "/opt/miles"
+        "C:/Program Files/miles"
+        "C:/Program Files (x86)/miles"
+        "C:/Program Files/Miles6"
+        "C:/Program Files (x86)/Miles6"
+  PATH_SUFFIXES "lib" "lib32"
+)
+find_library(MILES_RELWITHDEBINFO_LIBRARY
+  NAMES "miles_rd"
+  PATHS "/usr"
+        "/usr/local"
+        "/opt/miles"
+        "C:/Program Files/miles"
+        "C:/Program Files (x86)/miles"
+        "C:/Program Files/Miles6"
+        "C:/Program Files (x86)/Miles6"
+  PATH_SUFFIXES "lib" "lib32"
+)
+find_library(MILES_DEBUG_LIBRARY
+  NAMES "miles_d"
+  PATHS "/usr"
+        "/usr/local"
+        "/opt/miles"
+        "C:/Program Files/miles"
+        "C:/Program Files (x86)/miles"
+        "C:/Program Files/Miles6"
+        "C:/Program Files (x86)/Miles6"
+  PATH_SUFFIXES "lib" "lib32"
+)
 
-  # Choose library
-  if(CMAKE_BUILD_TYPE MATCHES "Release" AND MILES_RELEASE_LIBRARY)
-    set(MILES_LIBRARY ${MILES_RELEASE_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
-  elseif(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" AND MILES_RELDBG_LIBRARY)
-    set(MILES_LIBRARY ${MILES_RELWITHDEBINFO_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
-  elseif(CMAKE_BUILD_TYPE MATCHES "MinSizeRel" AND MILES_MINSIZE_LIBRARY)
-    set(MILES_LIBRARY ${MILES_MINSIZE_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
-  elseif(CMAKE_BUILD_TYPE MATCHES "Debug" AND MILES_DEBUG_LIBRARY)
-    set(MILES_LIBRARY ${MILES_DEBUG_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
-  endif()
-
-  # Set library path
-  get_filename_component(MILES_LIBRARY_DIR "${MILES_LIBRARY}" PATH)
-  set(MILES_LIBRARY_DIR "${MILES_LIBRARY_DIR}" CACHE PATH "The path to the Miles SDK library directory.")
+# Choose library
+if(CMAKE_BUILD_TYPE MATCHES "Release" AND MILES_RELEASE_LIBRARY)
+  set(MILES_LIBRARY ${MILES_RELEASE_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
+elseif(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" AND MILES_RELDBG_LIBRARY)
+  set(MILES_LIBRARY ${MILES_RELWITHDEBINFO_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
+elseif(CMAKE_BUILD_TYPE MATCHES "MinSizeRel" AND MILES_MINSIZE_LIBRARY)
+  set(MILES_LIBRARY ${MILES_MINSIZE_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
+elseif(CMAKE_BUILD_TYPE MATCHES "Debug" AND MILES_DEBUG_LIBRARY)
+  set(MILES_LIBRARY ${MILES_DEBUG_LIBRARY} CACHE FILEPATH "The Miles SDK library file.")
+endif()
 
-  # Check if we have everything we need
-  if(MILES_INCLUDE_DIR AND MILES_LIBRARY_DIR)
-    set(FOUND_MILES TRUE)
-    set(MILES_LIBS Mss32)
-  endif()
+# Set library path
+get_filename_component(MILES_LIBRARY_DIR "${MILES_LIBRARY}" PATH)
+set(MILES_LIBRARY_DIR "${MILES_LIBRARY_DIR}" CACHE PATH "The path to the Miles SDK library directory.")
 
-  mark_as_advanced(MILES_INCLUDE_DIR)
-  mark_as_advanced(MILES_DEBUG_LIBRARY)
-  mark_as_advanced(MILES_RELEASE_LIBRARY)
-  mark_as_advanced(MILES_RELWITHDEBINFO_LIBRARY)
-  mark_as_advanced(MILES_MINSIZE_LIBRARY)
+# Check if we have everything we need
+if(MILES_INCLUDE_DIR AND MILES_LIBRARY_DIR)
+  set(FOUND_MILES TRUE)
+  set(MILES_LIBS Mss32)
 endif()
 
+mark_as_advanced(MILES_INCLUDE_DIR)
+mark_as_advanced(MILES_DEBUG_LIBRARY)
+mark_as_advanced(MILES_RELEASE_LIBRARY)
+mark_as_advanced(MILES_RELWITHDEBINFO_LIBRARY)
+mark_as_advanced(MILES_MINSIZE_LIBRARY)
+
 # Choose library
 if(CMAKE_BUILD_TYPE MATCHES "RelWithDebInfo" AND MILES_RELDBG_LIBRARY)
   unset(MILES_LIBRARY CACHE)

cmake/modules/FindOpenEXR.cmake

@@ -10,13 +10,11 @@
 #   OPENEXR_LIBRARIES   - the path to the OpenEXR libraries
 #
 
-if(NOT OPENEXR_INCLUDE_DIR)
-  find_path(OPENEXR_INCLUDE_DIR
-    "ImfVersion.h"
-    PATH_SUFFIXES "OpenEXR")
+find_path(OPENEXR_INCLUDE_DIR
+  "ImfVersion.h"
+  PATH_SUFFIXES "OpenEXR")
 
-  mark_as_advanced(OPENEXR_INCLUDE_DIR)
-endif()
+mark_as_advanced(OPENEXR_INCLUDE_DIR)
 
 find_library(OPENEXR_imf_LIBRARY
   NAMES "IlmImf")

cmake/modules/FindOpenGLES1.cmake

@@ -10,18 +10,12 @@
 #   OPENGLES1_LIBRARY     - the library to link against for OpenGL ES 1.x
 #
 
-if(NOT OPENGLES1_INCLUDE_DIR AND NOT APPLE)
-  find_path(OPENGLES1_INCLUDE_DIR "GLES/gl.h")
+find_path(OPENGLES1_INCLUDE_DIR "GLES/gl.h")
 
-  mark_as_advanced(OPENGLES1_INCLUDE_DIR)
-endif()
+find_library(OPENGLES1_LIBRARY
+  NAMES "GLESv1" "GLESv1_CM" "GLES_CM")
 
-if(NOT OPENGLES1_LIBRARY AND NOT APPLE)
-  find_library(OPENGLES1_LIBRARY
-    NAMES "GLESv1" "GLESv1_CM" "GLES_CM")
-
-  mark_as_advanced(OPENGLES1_LIBRARY)
-endif()
+mark_as_advanced(OPENGLES1_INCLUDE_DIR OPENGLES1_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OpenGLES1 DEFAULT_MSG OPENGLES1_INCLUDE_DIR OPENGLES1_LIBRARY)

cmake/modules/FindOpenGLES2.cmake

@@ -10,18 +10,12 @@
 #   OPENGLES2_LIBRARY      - the library to link against for OpenGL ES 2.x
 #
 
-if(NOT OPENGLES2_INCLUDE_DIR AND NOT APPLE)
-  find_path(OPENGLES2_INCLUDE_DIR "GLES2/gl2.h")
+find_path(OPENGLES2_INCLUDE_DIR "GLES2/gl2.h")
 
-  mark_as_advanced(OPENGLES2_INCLUDE_DIR)
-endif()
+find_library(OPENGLES2_LIBRARY
+  NAMES "GLESv2")
 
-if(NOT OPENGLES2_LIBRARY AND NOT APPLE)
-  find_library(OPENGLES2_LIBRARY
-    NAMES "GLESv2")
-
-  mark_as_advanced(OPENGLES2_LIBRARY)
-endif()
+mark_as_advanced(OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(OpenGLES2 DEFAULT_MSG OPENGLES2_INCLUDE_DIR OPENGLES2_LIBRARY)

cmake/modules/FindSWResample.cmake

@@ -10,34 +10,32 @@
 #   SWRESAMPLE_LIBRARY     - the path to the library binary
 #
 
-if(NOT SWRESAMPLE_INCLUDE_DIR OR NOT SWRESAMPLE_LIBRARY)
-	# Find the libswresample include files
-	find_path(SWRESAMPLE_INCLUDE_DIR
-    NAMES "libswresample/swresample.h"
-		PATHS "/usr/include"
-		      "/usr/local/include"
-		      "/sw/include"
-		      "/opt/include"
-		      "/opt/local/include"
-		      "/opt/csw/include"
-		PATH_SUFFIXES "libav" "ffmpeg"
-	)
+# Find the libswresample include files
+find_path(SWRESAMPLE_INCLUDE_DIR
+  NAMES "libswresample/swresample.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/sw/include"
+        "/opt/include"
+        "/opt/local/include"
+        "/opt/csw/include"
+  PATH_SUFFIXES "libav" "ffmpeg"
+)
 
-	# Find the libswresample library
-  find_library(SWRESAMPLE_LIBRARY
-		NAMES "swresample"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libswresample library
+find_library(SWRESAMPLE_LIBRARY
+  NAMES "swresample"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	mark_as_advanced(SWRESAMPLE_INCLUDE_DIR)
-  mark_as_advanced(SWRESAMPLE_LIBRARY)
-endif()
+mark_as_advanced(SWRESAMPLE_INCLUDE_DIR)
+mark_as_advanced(SWRESAMPLE_LIBRARY)
 
 # Translate library into library directory
 if(SWRESAMPLE_LIBRARY)

cmake/modules/FindSWScale.cmake

@@ -10,34 +10,32 @@
 #   SWSCALE_LIBRARY     - the path to the library binary
 #
 
-if(NOT SWSCALE_INCLUDE_DIR OR NOT SWSCALE_LIBRARY)
-	# Find the libswscale include files
-	find_path(SWSCALE_INCLUDE_DIR
-    NAMES "libswscale/swscale.h"
-		PATHS "/usr/include"
-		      "/usr/local/include"
-		      "/sw/include"
-		      "/opt/include"
-		      "/opt/local/include"
-		      "/opt/csw/include"
-		PATH_SUFFIXES "libav" "ffmpeg"
-	)
+# Find the libswscale include files
+find_path(SWSCALE_INCLUDE_DIR
+  NAMES "libswscale/swscale.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+        "/sw/include"
+        "/opt/include"
+        "/opt/local/include"
+        "/opt/csw/include"
+  PATH_SUFFIXES "libav" "ffmpeg"
+)
 
-	# Find the libswscale library
-  find_library(SWSCALE_LIBRARY
-		NAMES "swscale"
-		PATHS "/usr"
-		      "/usr/local"
-		      "/usr/freeware"
-		      "/sw"
-		      "/opt"
-		      "/opt/csw"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
+# Find the libswscale library
+find_library(SWSCALE_LIBRARY
+  NAMES "swscale"
+  PATHS "/usr"
+        "/usr/local"
+        "/usr/freeware"
+        "/sw"
+        "/opt"
+        "/opt/csw"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
 
-	mark_as_advanced(SWSCALE_INCLUDE_DIR)
-  mark_as_advanced(SWSCALE_LIBRARY)
-endif()
+mark_as_advanced(SWSCALE_INCLUDE_DIR)
+mark_as_advanced(SWSCALE_LIBRARY)
 
 # Translate library into library directory
 if(SWSCALE_LIBRARY)

cmake/modules/FindTar.cmake

@@ -11,31 +11,29 @@
 #   TAR_LIBRARY - the path to the library binary
 #
 
-if(NOT TAR_INCLUDE_DIR OR NOT TAR_LIBRARY_DIR)
-	# Find the libtar include files
-	find_path(TAR_INCLUDE_DIR
-		NAMES "libtar.h"
-		PATHS "/usr/include"
-		      "/usr/local/include"
-		PATH_SUFFIXES "" "tar" "libtar"
-		DOC "The path to libtar's include directory."
-	)
+# Find the libtar include files
+find_path(TAR_INCLUDE_DIR
+  NAMES "libtar.h"
+  PATHS "/usr/include"
+        "/usr/local/include"
+  PATH_SUFFIXES "" "tar" "libtar"
+  DOC "The path to libtar's include directory."
+)
 
-	# Find the libtar library (.a, .so)
-	find_library(TAR_LIBRARY
-		NAMES "tar"
-		      "libtar"
-		PATHS "/usr"
-		      "/usr/local"
-		PATH_SUFFIXES "lib" "lib32" "lib64"
-	)
-	get_filename_component(TAR_LIBRARY_DIR "${TAR_LIBRARY}" PATH)
-	set(TAR_LIBRARY_DIR "${TAR_LIBRARY_DIR}" CACHE PATH "The path to libtar's library directory.") # Library path
+# Find the libtar library (.a, .so)
+find_library(TAR_LIBRARY
+  NAMES "tar"
+        "libtar"
+  PATHS "/usr"
+        "/usr/local"
+  PATH_SUFFIXES "lib" "lib32" "lib64"
+)
+get_filename_component(TAR_LIBRARY_DIR "${TAR_LIBRARY}" PATH)
+set(TAR_LIBRARY_DIR "${TAR_LIBRARY_DIR}" CACHE PATH "The path to libtar's library directory.") # Library path
 
-	mark_as_advanced(TAR_INCLUDE_DIR)
-	mark_as_advanced(TAR_LIBRARY_DIR)
-	mark_as_advanced(TAR_LIBRARY)
-endif()
+mark_as_advanced(TAR_INCLUDE_DIR)
+mark_as_advanced(TAR_LIBRARY_DIR)
+mark_as_advanced(TAR_LIBRARY)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(Tar DEFAULT_MSG TAR_LIBRARY TAR_INCLUDE_DIR TAR_LIBRARY_DIR)

cmake/modules/FindVRPN.cmake

@@ -10,20 +10,14 @@
 #   VRPN_LIBRARIES   - the path to the VRPN client libraries
 #
 
-if(NOT VRPN_INCLUDE_DIR)
-  find_path(VRPN_INCLUDE_DIR "vrpn_Connection.h")
+find_path(VRPN_INCLUDE_DIR "vrpn_Connection.h")
 
-  mark_as_advanced(VRPN_INCLUDE_DIR)
-endif()
-
-if(NOT VRPN_vrpn_LIBRARY)
-  find_library(VRPN_vrpn_LIBRARY
-    NAMES "vrpn")
+find_library(VRPN_vrpn_LIBRARY
+  NAMES "vrpn")
 
-  mark_as_advanced(VRPN_vrpn_LIBRARY)
-endif()
+mark_as_advanced(VRPN_INCLUDE_DIR VRPN_vrpn_LIBRARY)
 
-if(VRPN_vrpn_LIBRARY AND NOT VRPN_quat_LIBRARY)
+if(VRPN_vrpn_LIBRARY)
   get_filename_component(_vrpn_dir "${VRPN_vrpn_LIBRARY}" DIRECTORY)
   find_library(VRPN_quat_LIBRARY
     NAMES "quat"