From: Tim Kientzle <kientzle@gmail.com>
Date: Fri, 20 Dec 2013 04:14:26 +0000 (-0800)
Subject: Merge branch 'local_coverage' of github.com:kwk/libarchive into kwk-local_coverage
X-Git-Tag: v3.1.900a~351
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=135025e9992c19b2b177bf53e78664ef334a1051;p=thirdparty%2Flibarchive.git

Merge branch 'local_coverage' of github.com:kwk/libarchive into kwk-local_coverage

Conflicts:
	CMakeLists.txt
---

135025e9992c19b2b177bf53e78664ef334a1051
diff --cc CMakeLists.txt
index e11ed479d,cc98160c2..11b71394a
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -158,7 -151,7 +158,8 @@@ OPTION(ENABLE_XATTR "Enable extended at
  OPTION(ENABLE_ACL "Enable ACL support" ON)
  OPTION(ENABLE_ICONV "Enable iconv support" ON)
  OPTION(ENABLE_TEST "Enable unit and regression tests" ON)
+ OPTION(ENABLE_COVERAGE "Enable code coverage (GCC only, automatically sets ENABLE_TEST to ON)" FALSE)
 +
  SET(POSIX_REGEX_LIB "AUTO" CACHE STRING "Choose what library should provide POSIX regular expression support")
  SET(ENABLE_SAFESEH "AUTO" CACHE STRING "Enable use of /SAFESEH linker flag (MSVC only)")
  SET(WINDOWS_VERSION "" CACHE STRING "Set Windows version to use (Windows only)")