From 5c1ff5fdbc29f8582fb0fc93276a615568000664 Mon Sep 17 00:00:00 2001
From: Sam Edwards <CFSworks@gmail.com>
Date: Wed, 14 Feb 2018 17:38:25 -0700
Subject: [PATCH] CMake: Migrate detection of libtar

---
 dtool/Config.cmake     | 7 -------
 dtool/LocalSetup.cmake | 6 ------
 dtool/Package.cmake    | 8 ++++++++
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/dtool/Config.cmake b/dtool/Config.cmake
index 68866ab738..8ad74df904 100644
--- a/dtool/Config.cmake
+++ b/dtool/Config.cmake
@@ -491,13 +491,6 @@ option(HAVE_VIDEO4LINUX
   "Set this to enable webcam support on Linux." ${IS_LINUX})
 
 
-# Is libtar installed, and where?
-find_package(Tar QUIET)
-
-package_option(TAR
-  "This is used to optimize patch generation against tar files.")
-
-
 # TODO: FFTW2
 # Is libfftw installed, and where?
 #find_package(FFTW2 QUIET)
diff --git a/dtool/LocalSetup.cmake b/dtool/LocalSetup.cmake
index ea5557a026..fb0537ff31 100644
--- a/dtool/LocalSetup.cmake
+++ b/dtool/LocalSetup.cmake
@@ -190,12 +190,6 @@ endif()
 # Now go through all the packages and report whether we have them.
 show_packages()
 
-if(HAVE_TAR)
-  message("+ libtar")
-else()
-  message("- Did not find libtar")
-endif()
-
 if(HAVE_FFTW)
   message("+ fftw")
 else()
diff --git a/dtool/Package.cmake b/dtool/Package.cmake
index d3de122735..244c739846 100644
--- a/dtool/Package.cmake
+++ b/dtool/Package.cmake
@@ -65,6 +65,14 @@ find_package(TIFF QUIET)
 package_option(TIFF "Enable support for loading .tif images.")
 config_package(TIFF "libtiff")
 
+#
+# ------------ LIBTAR ------------
+#
+find_package(Tar QUIET)
+package_option(TAR
+  "This is used to optimize patch generation against tar files.")
+config_package(TAR "libtar")
+
 # Find and configure Miles Sound System
 find_package(Miles QUIET)
 #config_package(RAD_MSS "Miles Sound System")