From: Steven Baigal (sbaigal) <sbaigal@cisco.com>
Date: Tue, 23 Aug 2022 17:14:05 +0000 (+0000)
Subject: Pull request #3564: daq: Remove duplicate entries from static module list
X-Git-Tag: 3.1.40.0~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=95a8ef0e79c760e07f107d52538031df5af5772c;p=thirdparty%2Fsnort3.git

Pull request #3564: daq: Remove duplicate entries from static module list

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
---

diff --git a/cmake/FindDAQ.cmake b/cmake/FindDAQ.cmake
index c463bd166..bf5f66fed 100644
--- a/cmake/FindDAQ.cmake
+++ b/cmake/FindDAQ.cmake
@@ -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()