]> git.ipfire.org Git - thirdparty/snort3.git/commitdiff
Pull request #3564: daq: Remove duplicate entries from static module list
authorSteven Baigal (sbaigal) <sbaigal@cisco.com>
Tue, 23 Aug 2022 17:14:05 +0000 (17:14 +0000)
committerSteven Baigal (sbaigal) <sbaigal@cisco.com>
Tue, 23 Aug 2022 17:14:05 +0000 (17:14 +0000)
Merge in SNORT/snort3 from ~AKAYAMBU/snort3:daqcmakefix to master

Squashed commit of the following:

commit 9bd81840fdec5361257a729c0c54e70c39cd126c
Author: Arunkumar Kayambu <akayambu@cisco.com>
Date:   Fri Aug 19 11:41:19 2022 -0400

    daq: Remove duplicate entries from static module list
    thanks to GitHub user raging-loon for reporting the issue

cmake/FindDAQ.cmake

index c463bd166a0021433bb0ce7a3d9be81dcdcbb6ec..bf5f66fed3c2ab0d41bd042be6b0a6d1bfa6df3b 100644 (file)
@@ -66,6 +66,7 @@ if (PKG_CONFIG_EXECUTABLE AND ENABLE_STATIC_DAQ)
         set(DAQ_STATIC_MODULE_LIBS ${DAQ_STATIC_MODULE_LIBS} CACHE INTERNAL "Static DAQ module libraries")
     endif()
     if (DAQ_STATIC_MODULES)
+        list(REMOVE_DUPLICATES DAQ_STATIC_MODULES)
         list(SORT DAQ_STATIC_MODULES)
         set(DAQ_STATIC_MODULES ${DAQ_STATIC_MODULES} CACHE INTERNAL "Static DAQ modules")
     endif()