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 zlib package detection

Browse Source
This commit is contained in:
Sam Edwards 2018-02-20 17:19:21 -07:00
parent 0ed64c72ce
commit 72d668e05a
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dtool/Config.cmake
View File

@ -466,12 +466,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 ZLIB installed, and where?
find_package(ZLIB QUIET)
package_option(ZLIB DEFAULT ON
"Enables support for compression of Panda assets.")
# Is FFMPEG installed, and where? # Is FFMPEG installed, and where?
find_package(FFMPEG QUIET) find_package(FFMPEG QUIET)
find_package(SWScale QUIET) find_package(SWScale QUIET)

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_ZLIB)
message("+ zlib")
else()
message("- Did not find zlib")
endif()
if(HAVE_RAD_MSS) if(HAVE_RAD_MSS)
message("+ Miles Sound System") message("+ Miles Sound System")
else() else()

11
dtool/Package.cmake
View File

@ -135,6 +135,17 @@ package_option(VRPN
config_package(VRPN "VRPN") config_package(VRPN "VRPN")
#
# ------------ zlib ------------
#
find_package(zlib QUIET)
package_option(ZLIB
"Enables support for compression of Panda assets.")
config_package(ZLIB "zlib")
# 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")