Browse Source

CMake: Migrate detection of libtar

Sam Edwards 7 years ago
parent
commit
5c1ff5fdbc
3 changed files with 8 additions and 13 deletions
  1. 0 7
      dtool/Config.cmake
  2. 0 6
      dtool/LocalSetup.cmake
  3. 8 0
      dtool/Package.cmake

+ 0 - 7
dtool/Config.cmake

@@ -491,13 +491,6 @@ option(HAVE_VIDEO4LINUX
   "Set this to enable webcam support on Linux." ${IS_LINUX})
   "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
 # TODO: FFTW2
 # Is libfftw installed, and where?
 # Is libfftw installed, and where?
 #find_package(FFTW2 QUIET)
 #find_package(FFTW2 QUIET)

+ 0 - 6
dtool/LocalSetup.cmake

@@ -190,12 +190,6 @@ endif()
 # Now go through all the packages and report whether we have them.
 # Now go through all the packages and report whether we have them.
 show_packages()
 show_packages()
 
 
-if(HAVE_TAR)
-  message("+ libtar")
-else()
-  message("- Did not find libtar")
-endif()
-
 if(HAVE_FFTW)
 if(HAVE_FFTW)
   message("+ fftw")
   message("+ fftw")
 else()
 else()

+ 8 - 0
dtool/Package.cmake

@@ -65,6 +65,14 @@ find_package(TIFF QUIET)
 package_option(TIFF "Enable support for loading .tif images.")
 package_option(TIFF "Enable support for loading .tif images.")
 config_package(TIFF "libtiff")
 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 and configure Miles Sound System
 find_package(Miles QUIET)
 find_package(Miles QUIET)
 #config_package(RAD_MSS "Miles Sound System")
 #config_package(RAD_MSS "Miles Sound System")