diff --git a/dtool/Config.cmake b/dtool/Config.cmake index b4acfeb745..d38e394f87 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -466,12 +466,6 @@ option(HAVE_VIDEO4LINUX "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? find_package(FFMPEG QUIET) find_package(SWScale QUIET) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index d0177b6e65..1c7d4beffc 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -189,12 +189,6 @@ endif() # Now go through all the packages and report whether we have them. show_packages() -if(HAVE_ZLIB) - message("+ zlib") -else() - message("- Did not find zlib") -endif() - if(HAVE_RAD_MSS) message("+ Miles Sound System") else() diff --git a/dtool/Package.cmake b/dtool/Package.cmake index 97303013ce..6160db69de 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -135,6 +135,17 @@ package_option(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_package(Miles QUIET) #config_package(RAD_MSS "Miles Sound System")