diff --git a/cmake/macros/PackageConfig.cmake b/cmake/macros/PackageConfig.cmake
index f0399abe87..dc88e2ac13 100644
--- a/cmake/macros/PackageConfig.cmake
+++ b/cmake/macros/PackageConfig.cmake
@@ -32,7 +32,7 @@ function(package_option name)
   # Parse the arguments.
   set(command)
   set(default)
-  set(license)
+  set(license "")
   set(cache_string)
 
   foreach(arg ${ARGN})
@@ -73,9 +73,10 @@ function(package_option name)
       else()
         list(FIND PANDA_DIST_USE_LICENSES ${license} license_index)
         # If the license isn't in the accept listed, don't use the package
-        if(license_index EQUAL -1)
+        message("INDEX for ${name}: ${license_index}")
+        if(${license_index} EQUAL "-1")
           set(default OFF)
-        else
+        else()
           set(default "${${name}_FOUND}")
         endif()
       endif()
diff --git a/dtool/Config.cmake b/dtool/Config.cmake
index d4cd435331..dea237f89d 100644
--- a/dtool/Config.cmake
+++ b/dtool/Config.cmake
@@ -528,19 +528,25 @@ package_option(SQUISH
 
 # Is Cg installed, and where?
 find_package(Cg QUIET)
-package_option(CG "Enable support for Nvidia Cg Shading Language")
-package_option(CGGL "Enable support for Nvidia Cg's OpenGL API.")
-package_option(CGDX8 "Enable support for Nvidia Cg's DX8 API.")
-package_option(CGDX9 "Enable support for Nvidia Cg's DX9 API.")
-package_option(CGDX10 "Enable support for Nvidia Cg's DX10 API.")
+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(CGDX8 "Enable support for Nvidia Cg's DX8 API."
+  LICENSE "Nvidia")
+package_option(CGDX9 "Enable support for Nvidia Cg's DX9 API."
+  LICENSE "Nvidia")
+package_option(CGDX10 "Enable support for Nvidia Cg's DX10 API."
+  LICENSE "Nvidia")
 
 
 # Is VRPN installed, and where?
 find_package(VRPN)
 
 package_option(VRPN
-  "Enables support for connecting to VRPN servers."
-  LICENSE "Nvidia")
+  "Enables support for connecting to VRPN servers.")
 
 
 # TODO: Helix