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

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 4a3ab95ae3a1a4d9c4a378b1aa9702f58256f004..595317ea397252abd85c52b34007c17951c99a2f 100644 (file)
--- 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 a3a42a4f6e7c29f1405b9914f24d7b1ca9bb5b8b..76cf24adb7f398d4ebdbc737dde81ff969cbed88 100644 (file)
--- 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()