diff --git a/dtool/Config.cmake b/dtool/Config.cmake index 7ba8afc0d9..3181818630 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -475,18 +475,6 @@ option(HAVE_VIDEO4LINUX "Set this to enable webcam support on Linux." ${IS_LINUX}) -# Is Cg installed, and where? -find_package(Cg QUIET) -package_option(CG - "Enable support for Nvidia Cg Shading Language" - LICENSE "Nvidia") -package_option(CGGL - "Enable support for Nvidia Cg's OpenGL API." - LICENSE "Nvidia") -package_option(CGDX9 "Enable support for Nvidia Cg's DX9 API." - LICENSE "Nvidia") - - # Is VRPN installed, and where? find_package(VRPN QUIET) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index 1d6d442e43..08417bbcbc 100644 --- a/dtool/LocalSetup.cmake +++ b/dtool/LocalSetup.cmake @@ -189,24 +189,6 @@ endif() # Now go through all the packages and report whether we have them. show_packages() -if(HAVE_CG) - message("+ Nvidia Cg High Level Shading Language") -else() - message("- Did not find Nvidia Cg High Level Shading Language") -endif() - -if(HAVE_CGGL) - message("+ Cg OpenGL API") -else() - message("- Did not find Cg OpenGL API") -endif() - -if(HAVE_CGDX9) - message("+ Cg DX9 API") -else() - message("- Did not find Cg DX9 API") -endif() - if(HAVE_VRPN) message("+ VRPN") else() diff --git a/dtool/Package.cmake b/dtool/Package.cmake index f703c50f16..f9f96e8765 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -96,6 +96,33 @@ package_option(SQUISH config_package(SQUISH "libsquish") +# +# ------------ Nvidia Cg ------------ +# + +find_package(Cg QUIET) + +package_option(CG + "Enable support for Nvidia Cg Shading Language" + LICENSE "Nvidia") +package_option(CGGL + "Enable support for Nvidia Cg's OpenGL API." + LICENSE "Nvidia") +package_option(CGDX9 + "Enable support for Nvidia Cg's DirectX 9 API." + LICENSE "Nvidia") + +if(HAVE_CGGL AND HAVE_CGDX9) + set(cg_apis "supporting OpenGL and DirectX 9") +elseif(HAVE_CGGL) + set(cg_apis "supporting OpenGL") +elseif(HAVE_CGDX9) + set(cg_apis "supporting DirectX 9") +else() + set(cg_apis "WITHOUT rendering backend support") +endif() +config_package(CG "Nvidia Cg Shading Language" "${cg_apis}") + # Find and configure Miles Sound System find_package(Miles QUIET) #config_package(RAD_MSS "Miles Sound System")