[test-suite] r264497 - cmake: Cleanup ClamAV CMakeLists.txt.
Matthias Braun via llvm-commits
llvm-commits at lists.llvm.org
Fri Mar 25 21:05:44 PDT 2016
Author: matze
Date: Fri Mar 25 23:05:44 2016
New Revision: 264497
URL: http://llvm.org/viewvc/llvm-project?rev=264497&view=rev
Log:
cmake: Cleanup ClamAV CMakeLists.txt.
This way we can get rid of the llvm_prepend() function.
Modified:
test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
test-suite/trunk/cmake/modules/MakefileFunctions.cmake
Modified: test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt?rev=264497&r1=264496&r2=264497&view=diff
==============================================================================
--- test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt (original)
+++ test-suite/trunk/MultiSource/Applications/ClamAV/CMakeLists.txt Fri Mar 25 23:05:44 2016
@@ -1,15 +1,88 @@
-set(TMP1 aspack.c autoit.c binhex.c blob.c cab.c chmunpack.c cvd.c dconf.c dsig.c elf.c entconv.c filetypes.c fsg.c hashtab.c htmlnorm.c is_tar.c jscript.c line.c lockdb.c matcher-ac.c matcher-bm.c matcher.c mbox.c md5.c message.c mew.c msexpand.c mspack.c ole2_extract.c others.c packlibs.c pdf.c pe.c petite.c phishcheck.c phish_domaincheck_db.c phish_whitelist.c pst.c readdb.c rebuildpe.c regex_list.c rtf.c scanners.c sis.c snprintf.c special.c spin.c str.c suecrypt.c table.c text.c tnef.c unarj.c unsp.c untar.c unzip.c upack.c upx.c uuencode.c vba_extract.c wwunpack.c yc.c)
-llvm_prepend(TMP1 libclamav_ ${TMP1})
-set(TMP2 clamscan.c manager.c others.c treewalk.c)
-llvm_prepend(TMP2 clamscan_ ${TMP2})
-set(TMP3 cdiff.c cfgparser.c getopt.c misc.c network.c options.c output.c sha256.c)
-llvm_prepend(TMP3 shared_ ${TMP3})
-set(TMP4 regerror.c regfree.c regcomp.c regexec.c strlcpy.c)
-llvm_prepend(TMP4 libclamav_regex_ ${TMP4})
-set(TMP5 nulsft.c bzlib.c infblock.c LZMADecode.c )
-llvm_prepend(TMP5 libclamav_nsis_ ${TMP5})
-set(Source ${TMP1} ${TMP2} ${TMP3} ${TMP4} ${TMP5})
-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(Source
+ clamscan_clamscan.c
+ clamscan_manager.c
+ clamscan_others.c
+ clamscan_treewalk.c
+ libclamav_aspack.c
+ libclamav_autoit.c
+ libclamav_binhex.c
+ libclamav_blob.c
+ libclamav_cab.c
+ libclamav_chmunpack.c
+ libclamav_cvd.c
+ libclamav_dconf.c
+ libclamav_dsig.c
+ libclamav_elf.c
+ libclamav_entconv.c
+ libclamav_filetypes.c
+ libclamav_fsg.c
+ libclamav_hashtab.c
+ libclamav_htmlnorm.c
+ libclamav_is_tar.c
+ libclamav_jscript.c
+ libclamav_line.c
+ libclamav_lockdb.c
+ libclamav_matcher-ac.c
+ libclamav_matcher-bm.c
+ libclamav_matcher.c
+ libclamav_mbox.c
+ libclamav_md5.c
+ libclamav_message.c
+ libclamav_mew.c
+ libclamav_msexpand.c
+ libclamav_mspack.c
+ libclamav_nsis_LZMADecode.c
+ libclamav_nsis_bzlib.c
+ libclamav_nsis_infblock.c
+ libclamav_nsis_nulsft.c
+ libclamav_ole2_extract.c
+ libclamav_others.c
+ libclamav_packlibs.c
+ libclamav_pdf.c
+ libclamav_pe.c
+ libclamav_petite.c
+ libclamav_phish_domaincheck_db.c
+ libclamav_phish_whitelist.c
+ libclamav_phishcheck.c
+ libclamav_pst.c
+ libclamav_readdb.c
+ libclamav_rebuildpe.c
+ libclamav_regex_list.c
+ libclamav_regex_regcomp.c
+ libclamav_regex_regerror.c
+ libclamav_regex_regexec.c
+ libclamav_regex_regfree.c
+ libclamav_regex_strlcpy.c
+ libclamav_rtf.c
+ libclamav_scanners.c
+ libclamav_sis.c
+ libclamav_snprintf.c
+ libclamav_special.c
+ libclamav_spin.c
+ libclamav_str.c
+ libclamav_suecrypt.c
+ libclamav_table.c
+ libclamav_text.c
+ libclamav_tnef.c
+ libclamav_unarj.c
+ libclamav_unsp.c
+ libclamav_untar.c
+ libclamav_unzip.c
+ libclamav_upack.c
+ libclamav_upx.c
+ libclamav_uuencode.c
+ libclamav_vba_extract.c
+ libclamav_wwunpack.c
+ libclamav_yc.c
+ shared_cdiff.c
+ shared_cfgparser.c
+ shared_getopt.c
+ shared_misc.c
+ shared_network.c
+ shared_options.c
+ shared_output.c
+ shared_sha256.c
+)
set(PROG clamscan)
list(APPEND CPPFLAGS -DHAVE_CONFIG_H -I. -DDONT_LOCK_DBDIRS)
@@ -18,6 +91,24 @@ find_package(ZLIB REQUIRED)
include_directories(${ZLIB_INCLUDE_DIRS})
set(LDFLAGS ${ZLIB_LIBRARIES})
+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(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)
Modified: test-suite/trunk/cmake/modules/MakefileFunctions.cmake
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/cmake/modules/MakefileFunctions.cmake?rev=264497&r1=264496&r2=264497&view=diff
==============================================================================
--- test-suite/trunk/cmake/modules/MakefileFunctions.cmake (original)
+++ test-suite/trunk/cmake/modules/MakefileFunctions.cmake Fri Mar 25 23:05:44 2016
@@ -13,12 +13,3 @@ macro(llvm_add_subdirectories)
add_subdirectory(${V})
endforeach(V)
endmacro()
-
-# equivalent to $(addprefix var,prefix). Modifies var in place.
-function(llvm_prepend var prefix)
- set(listVar "")
- foreach(f ${ARGN})
- list(APPEND listVar "${prefix}${f}")
- endforeach(f)
- set(${var} "${listVar}" PARENT_SCOPE)
-endfunction()
More information about the llvm-commits
mailing list