From 17d56279f5640d4c505cdd71da1da383c2be4524 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 20 Feb 2018 19:28:32 -0700 Subject: [PATCH] CMake: Migrate FreeType package detection --- dtool/LocalSetup.cmake | 6 ------ dtool/Package.cmake | 14 +++++++++++--- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index b9d331e92e..87d8739a15 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -207,12 +207,6 @@ else() message("- Did not find gtk+-2") endif() -if(HAVE_FREETYPE) - message("+ Freetype") -else() - message("- Did not find Freetype") -endif() - if(HAVE_WX) message("+ WxWidgets") else() diff --git a/dtool/Package.cmake b/dtool/Package.cmake index 26b2e8ac05..1684126405 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -205,10 +205,18 @@ package_option(OPENAL LICENSE "LGPL") config_package(OPENAL "OpenAL sound library") -# Find and configure Freetype + +# +# ------------ FreeType ------------ +# + find_package(Freetype QUIET) -#config_package(FREETYPE "Freetype") -package_option(FREETYPE) + +package_option(FREETYPE + "This enables support for the FreeType font-rendering library. If disabled, + Panda3D will only be able to read fonts specially made with egg-mkfont.") + +config_package(FREETYPE "FreeType") # Find and configure GTK set(Freetype_FIND_QUIETLY TRUE) # Fix for builtin FindGTK2