TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

CMake: Migrate detection of libsquish

Browse Source
This commit is contained in:
Sam Edwards 2018-02-18 21:41:33 -07:00
parent 71836f09e3
commit a9717cf3ab
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dtool/Config.cmake
View File

@ -475,13 +475,6 @@ option(HAVE_VIDEO4LINUX
"Set this to enable webcam support on Linux." ${IS_LINUX}) "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? # Is Cg installed, and where?
find_package(Cg QUIET) find_package(Cg QUIET)
package_option(CG package_option(CG

6
dtool/LocalSetup.cmake
View File

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

11
dtool/Package.cmake
View File

@ -85,6 +85,17 @@ package_option(FFTW
config_package(FFTW "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 and configure Miles Sound System
find_package(Miles QUIET) find_package(Miles QUIET)
#config_package(RAD_MSS "Miles Sound System") #config_package(RAD_MSS "Miles Sound System")