]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Merge branch 'local_coverage' of github.com:kwk/libarchive into kwk-local_coverage
authorTim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:14:26 +0000 (20:14 -0800)
committerTim Kientzle <kientzle@gmail.com>
Fri, 20 Dec 2013 04:14:26 +0000 (20:14 -0800)
Conflicts:
CMakeLists.txt

1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
index e11ed479d44349ca79c545557c41141b8968a980,cc98160c223a8ecbd3f4c3d301336dc67c4f4784..11b71394a23c3a1a0ea40c3b040120d2c084a32c
@@@ -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)")