Merge pull request #369 in SNORT/snort3 from ~JOCORNET/snort3:cmake_fixes to master

Squashed commit of the following:

commit d5735f1a87693f58ed595ce56476da6a0640d18d
Author: Joel Cornett <joel.cornett@gmail.com>
Date:   Fri Mar 25 13:36:31 2016 -0400

    changed FATAL_ERROR -> SEND_ERROR

diff --git a/cmake/FindDAQ.cmake b/cmake/FindDAQ.cmake
index aafc976c569f110b5a3507b1d34a5eae8de7b7e4..275dd0b172eefbc6770f9735584187c7bcdfd323 100644 (file)
--- a/cmake/FindDAQ.cmake
+++ b/cmake/FindDAQ.cmake
@@ -20,8 +20,6 @@ set (ERROR_MESSAGE
     also set the DAQ_DIR environment variablet to the daqs root installation directory\n\n"
 )
 
-
-
 find_path(DAQ_INCLUDE_DIR
     NAMES daq.h
     HINTS ENV DAQ_DIR
@@ -37,15 +35,15 @@ if (ENABLE_STATIC_DAQ)
         RESULT_VARIABLE result
         OUTPUT_STRIP_TRAILING_WHITESPACE
     )
-    
+
     # This will be false if the exit status was 0 and true if the binary was not found
     if (result)
-        message(FATAL_ERROR "
+        message(SEND_ERROR "
 
         ERROR!  cannot find the DAQs static libraries!  make sure the binary
         file `daq-modules-config` is in your path, or specific the daqs path 
         with the --with-daq-root=<dir>
-        
+
         ")
     endif()
 

diff --git a/cmake/FindHWLOC.cmake b/cmake/FindHWLOC.cmake
index cdf01a2c604d9bf2f2ae3e41eaeedd3dcce20b3e..88ed79bf55375dd7868a76b05cb85b043d3d2ddd 100644 (file)
--- a/cmake/FindHWLOC.cmake
+++ b/cmake/FindHWLOC.cmake
@@ -3,7 +3,7 @@ find_package(PkgConfig)
 pkg_check_modules(PC_HWLOC hwloc)
 
 if (NOT PC_HWLOC_FOUND)
-    message(FATAL_ERROR
+    message(SEND_ERROR
         "\n\tERROR!  hwloc library not found.\n"
         "\tGet it from https://www.open-mpi.org/projects/hwloc/\n"
     )

diff --git a/cmake/FindPCAP.cmake b/cmake/FindPCAP.cmake
index bccf4249204d8df5a5cf5e2489cbe3b07a8bb957..5ea44ffc42b9ebfcce7f09f26f2ed3c904cc9396 100644 (file)
--- a/cmake/FindPCAP.cmake
+++ b/cmake/FindPCAP.cmake
@@ -70,7 +70,7 @@ if (NOT PCAP_LINKS_SOLO)
         set(PCAP_LIBRARIES ${_tmp}
             CACHE STRING "Libraries needed to link against libpcap" FORCE)
     else ()
-        message(FATAL_ERROR "Couldn't determine how to link against libpcap")
+        message(SEND_ERROR "Couldn't determine how to link against libpcap")
     endif ()
 endif ()
 

diff --git a/cmake/FindPCRE.cmake b/cmake/FindPCRE.cmake
index df626358aa2cca6cf4e5dcae1784c4d31b165656..199e9131eeacf76033b906a9148657e94ff2ce81 100644 (file)
--- a/cmake/FindPCRE.cmake
+++ b/cmake/FindPCRE.cmake
@@ -48,7 +48,7 @@ if(NOT VALID_PCRE_VERSION)
     unset(PCRE_FOUND CACHE)
     unset(PCRE_INCLUDE_DIR CACHE)
     unset(PCRE_LIBRARIES CACHE)
-    message(FATAL_ERROR
+    message(SEND_ERROR
         "\nERROR!  Libpcre library version >= 6.0 not found."
         " Get it from http://www.pcre.org\n\n"
     )

diff --git a/src/catch/CMakeLists.txt b/src/catch/CMakeLists.txt
index 5a89a629b6b8becae3d01326050b7d774efe4f74..8e5290e7c80dd604dcd78616c2dd3982ed60e81a 100644 (file)
--- a/src/catch/CMakeLists.txt
+++ b/src/catch/CMakeLists.txt
@@ -8,7 +8,7 @@ if ( LINUX )
     find_library(LIBRT rt)
 
     if ( NOT LIBRT )
-        message(FATAL_ERROR "librt required. Specicy it by user ")
+        message(SEND_ERROR "librt required.")
     endif()
 endif()