From 0ed64c72ce0d1322076996d03ab20c1031b84e04 Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Tue, 20 Feb 2018 17:02:17 -0700 Subject: [PATCH] CMake: Migrate over VRPN detection --- dtool/Config.cmake | 7 ------- dtool/LocalSetup.cmake | 6 ------ dtool/Package.cmake | 12 ++++++++++++ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/dtool/Config.cmake b/dtool/Config.cmake index bc7474b1c5..b4acfeb745 100644 --- a/dtool/Config.cmake +++ b/dtool/Config.cmake @@ -466,13 +466,6 @@ option(HAVE_VIDEO4LINUX "Set this to enable webcam support on Linux." ${IS_LINUX}) -# Is VRPN installed, and where? -find_package(VRPN QUIET) - -package_option(VRPN - "Enables support for connecting to VRPN servers.") - - # Is ZLIB installed, and where? find_package(ZLIB QUIET) diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake index 08417bbcbc..d0177b6e65 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_VRPN) - message("+ VRPN") -else() - message("- Did not find VRPN") -endif() - if(HAVE_ZLIB) message("+ zlib") else() diff --git a/dtool/Package.cmake b/dtool/Package.cmake index f9f96e8765..97303013ce 100644 --- a/dtool/Package.cmake +++ b/dtool/Package.cmake @@ -123,6 +123,18 @@ else() endif() config_package(CG "Nvidia Cg Shading Language" "${cg_apis}") +# +# ------------ VRPN ------------ +# + +find_package(VRPN QUIET) + +package_option(VRPN + "Enables support for connecting to VRPN servers. This is only needed if you + are building Panda3D for a fixed VRPN-based VR installation.") + +config_package(VRPN "VRPN") + # Find and configure Miles Sound System find_package(Miles QUIET) #config_package(RAD_MSS "Miles Sound System")