From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Thu, 19 Nov 2015 15:43:22 +0000 (-0500)
Subject: Merge pull request #142 in SNORT/snort3 from ~JOCORNET/snort3:hyperscan_cmake_patch... 
X-Git-Tag: 3.0.0-233~720
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=595b3f855f614ac6bd1b41da5dfb5a437539991a;p=thirdparty%2Fsnort3.git

Merge pull request #142 in SNORT/snort3 from ~JOCORNET/snort3:hyperscan_cmake_patch to master

Squashed commit of the following:

commit 11cc0e2a7df1c1216940bacf64265abe0bcf1421
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Thu Nov 19 09:48:43 2015 -0500

    moved target_link_libraries directives inside of HAVE_HYPERSCAN condition
---

diff --git a/src/ips_options/test/CMakeLists.txt b/src/ips_options/test/CMakeLists.txt
index 4a3ab95ae..595317ea3 100644
--- a/src/ips_options/test/CMakeLists.txt
+++ b/src/ips_options/test/CMakeLists.txt
@@ -5,9 +5,8 @@ if ( HAVE_HYPERSCAN )
         framework
         sfip
         catch_tests
-)
-endif()
-
-target_link_libraries(ips_regex_test ${HS_LIBRARIES})
-target_include_directories(ips_regex_test PUBLIC ${LUAJIT_INCLUDE_DIR})
+    )
 
+    target_link_libraries(ips_regex_test ${HS_LIBRARIES})
+    target_include_directories(ips_regex_test PUBLIC ${LUAJIT_INCLUDE_DIR})
+endif()
diff --git a/src/search_engines/test/CMakeLists.txt b/src/search_engines/test/CMakeLists.txt
index a3a42a4f6..76cf24adb 100644
--- a/src/search_engines/test/CMakeLists.txt
+++ b/src/search_engines/test/CMakeLists.txt
@@ -4,7 +4,6 @@ if ( HAVE_HYPERSCAN )
         framework
         catch_tests
     )
-endif()
-
-target_link_libraries(hyperscan_test ${HS_LIBRARIES})
 
+    target_link_libraries(hyperscan_test ${HS_LIBRARIES})
+endif()