Browse Source

CMake: Migrate detection of libsquish

Sam Edwards 7 years ago
parent
commit
a9717cf3ab
3 changed files with 11 additions and 13 deletions
  1. 0 7
      dtool/Config.cmake
  2. 0 6
      dtool/LocalSetup.cmake
  3. 11 0
      dtool/Package.cmake

+ 0 - 7
dtool/Config.cmake

@@ -475,13 +475,6 @@ option(HAVE_VIDEO4LINUX
   "Set this to enable webcam support on Linux." ${IS_LINUX})
 
 
-# Is libsquish installed, and where?
-find_package(Squish QUIET)
-
-package_option(SQUISH
-  "Enables support for automatic compression of DXT textures.")
-
-
 # Is Cg installed, and where?
 find_package(Cg QUIET)
 package_option(CG

+ 0 - 6
dtool/LocalSetup.cmake

@@ -189,12 +189,6 @@ endif()
 # Now go through all the packages and report whether we have them.
 show_packages()
 
-if(HAVE_SQUISH)
-  message("+ squish")
-else()
-  message("- Did not find squish")
-endif()
-
 if(HAVE_CG)
   message("+ Nvidia Cg High Level Shading Language")
 else()

+ 11 - 0
dtool/Package.cmake

@@ -85,6 +85,17 @@ package_option(FFTW
 
 config_package(FFTW "FFTW")
 
+#
+# ------------ libsquish ------------
+#
+
+find_package(Squish QUIET)
+
+package_option(SQUISH
+  "Enables support for automatic compression of DXT textures.")
+
+config_package(SQUISH "libsquish")
+
 # Find and configure Miles Sound System
 find_package(Miles QUIET)
 #config_package(RAD_MSS "Miles Sound System")