From: Josh <jrosenba@cisco.com>
Date: Fri, 17 Oct 2014 00:01:32 +0000 (-0500)
Subject: fixing CMake.  Now build extra plugins from main build directory again
X-Git-Tag: 3.0.0-233~1362
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8ea9534483ad88733ba4e6c00ce240a4441b722a;p=thirdparty%2Fsnort3.git

fixing CMake.  Now build extra plugins from main build directory again
---

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 7333df18e..7d16728a5 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,5 +1,6 @@
 
 if (BUILD_EXTRA_PLUGINS)
+    set(SNORT_EXECUTABLE $<TARGET_FILE:snort> CACHE INTERNAL "Snort binary" FORCE)
     add_subdirectory(src)
 
 else (BUILD_EXTRA_PLUGINS)
diff --git a/extra/src/so_rules/CMakeLists.txt b/extra/src/so_rules/CMakeLists.txt
index e63816024..f0c9915b5 100644
--- a/extra/src/so_rules/CMakeLists.txt
+++ b/extra/src/so_rules/CMakeLists.txt
@@ -4,7 +4,7 @@ macro (create_txt_header txt_file hdr_file)
 
     add_custom_command( OUTPUT ${hdr_file}
         COMMAND
-            "${SNORT_EXECUTABLE}" --rule-to-text < "${CMAKE_CURRENT_SOURCE_DIR}/${txt_file}" > "${CMAKE_CURRENT_BINARY_DIR}/${hdr_file}"
+            "${SNORT_EXECUTABLE}" --rule-to-text < "${CMAKE_CURRENT_LIST_DIR}/${txt_file}" > "${CMAKE_CURRENT_BINARY_DIR}/${hdr_file}"
         DEPENDS "${txt_file}"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "so_rules: Building ${hdr_file}"
@@ -18,7 +18,7 @@ macro (create_pro_header txt_file hdr_file)
 
     add_custom_command( OUTPUT ${hdr_file}
         COMMAND
-            "${SNORT_EXECUTABLE}" --rule-to-hex < "${CMAKE_CURRENT_SOURCE_DIR}/${txt_file}" > "${CMAKE_CURRENT_BINARY_DIR}/${hdr_file}"
+            "${SNORT_EXECUTABLE}" --rule-to-hex < "${CMAKE_CURRENT_LIST_DIR}/${txt_file}" > "${CMAKE_CURRENT_BINARY_DIR}/${hdr_file}"
         DEPENDS "${txt_file}"
         WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
         COMMENT "so_rules: Building ${hdr_file}"