[PATCH] D17196: [test-suite] Use cmake `find_package` to search zLib for ClamAV test case

Simon Atanasyan via llvm-commits llvm-commits at lists.llvm.org
Fri Feb 12 13:26:08 PST 2016


This revision was automatically updated to reflect the committed changes.
Closed by commit rL260738: [test-suite] Use cmake `find_package` to search zLib for ClamAV test case (authored by atanasyan).

Changed prior to commit:
  http://reviews.llvm.org/D17196?vs=47793&id=47849#toc

Repository:
  rL LLVM

http://reviews.llvm.org/D17196

Files:
  test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt

Index: test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
===================================================================
--- test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
+++ test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
@@ -12,7 +12,12 @@
 set(INPUT ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.cab ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clamdoc.tar.gz ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.exe ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.exe.bz2 ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam-v2.rar ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam-v3.rar ${CMAKE_CURRENT_SOURCE_DIR}/inputs/clam.zip ${CMAKE_CURRENT_SOURCE_DIR}/inputs/README ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc11.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc1.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc22.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/Doc2.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/doc3.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/docCLAMexe.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/rtf1.rtf ${CMAKE_CURRENT_SOURCE_DIR}/inputs/rtf-test/rtf-novirus.rtf)
 set(PROG clamscan)
 list(APPEND CPPFLAGS -DHAVE_CONFIG_H -I. -DDONT_LOCK_DBDIRS)
-set(LDFLAGS -lz)
+
+# Find zLib library required for building ClamAV
+find_package(ZLIB REQUIRED)
+include_directories(${ZLIB_INCLUDE_DIRS})
+set(LDFLAGS ${ZLIB_LIBRARIES})
+
 set(RUN_OPTIONS --debug --exclude-dir .svn --verbose -d${CMAKE_CURRENT_SOURCE_DIR}/dbdir -r ${INPUT})
 if("${TARGET_OS}" STREQUAL "Darwin")
   list(APPEND CPPFLAGS -DC_DARWIN)


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D17196.47849.patch
Type: text/x-patch
Size: 1546 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160212/9ff16520/attachment-0001.bin>


More information about the llvm-commits mailing list