From: Steve Chew (stechew) <stechew@cisco.com>
Date: Fri, 6 Mar 2020 20:24:57 +0000 (+0000)
Subject: Merge pull request #2058 in SNORT/snort3 from ~STECHEW/snort3:lzma_fix to master
X-Git-Tag: 3.0.0-269~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=98d275b207a44d7b4161e3393e66526e24e2f417;p=thirdparty%2Fsnort3.git

Merge pull request #2058 in SNORT/snort3 from ~STECHEW/snort3:lzma_fix to master

Squashed commit of the following:

commit e259cd43f913bec63910d067bc2b276c77390e4a
Author: Steve Chew <stechew@cisco.com>
Date:   Wed Mar 4 01:46:40 2020 -0500

    cmake: Fix building without lzma library.
    Thanks to Fabrice Fontaine <fontaine.fabrice@gmail.com> for reporting the issue.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4c58fe463..edc6a765b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -7,7 +7,6 @@ set(EXTERNAL_LIBRARIES
     ${CMAKE_DL_LIBS}
     ${CMAKE_THREAD_LIBS_INIT} # GCC says we must link to the threads library
     ${HWLOC_LIBRARIES}
-    ${LIBLZMA_LIBRARIES}
     ${LUAJIT_LIBRARIES}
     ${OPENSSL_CRYPTO_LIBRARY}
     ${PCAP_LIBRARIES}
@@ -27,20 +26,28 @@ set(EXTERNAL_INCLUDES
     ${ZLIB_INCLUDE_DIRS}
 )
 
+if ( ENABLE_STATIC_DAQ )
+    LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS})
+endif ()
+
 if ( FLATBUFFERS_FOUND )
     LIST(APPEND EXTERNAL_LIBRARIES ${FLATBUFFERS_LIBRARIES})
 endif()
 
-if ( HS_FOUND )
-    LIST(APPEND EXTERNAL_LIBRARIES ${HS_LIBRARIES})
-    LIST(APPEND EXTERNAL_INCLUDES ${HS_INCLUDE_DIRS})
-endif ()
+if ( HAVE_LZMA )
+    LIST(APPEND EXTERNAL_LIBRARIES ${LIBLZMA_LIBRARIES})
+endif()
 
 if ( HAVE_SAFEC )
     LIST(APPEND EXTERNAL_LIBRARIES ${SAFEC_LIBRARIES})
     LIST(APPEND EXTERNAL_INCLUDES ${SAFEC_INCLUDE_DIR})
 endif ()
 
+if ( HS_FOUND )
+    LIST(APPEND EXTERNAL_LIBRARIES ${HS_LIBRARIES})
+    LIST(APPEND EXTERNAL_INCLUDES ${HS_INCLUDE_DIRS})
+endif ()
+
 if ( ICONV_FOUND )
     LIST(APPEND EXTERNAL_LIBRARIES ${ICONV_LIBRARY})
     LIST(APPEND EXTERNAL_INCLUDES ${ICONV_INCLUDE_DIR})
@@ -51,10 +58,6 @@ if ( USE_TIRPC )
     LIST(APPEND EXTERNAL_INCLUDES ${TIRPC_INCLUDE_DIRS})
 endif ()
 
-if ( ENABLE_STATIC_DAQ )
-    LIST(APPEND EXTERNAL_LIBRARIES ${DAQ_STATIC_MODULE_LIBS})
-endif ()
-
 include_directories(BEFORE ${LUAJIT_INCLUDE_DIR})
 include_directories(AFTER ${EXTERNAL_INCLUDES})