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

diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 7333df18ef44707c434841b915db7533b76441e4..7d16728a5fbd28cf15a2cd378a71f3fb4c0ce894 100644 (file)
--- 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 e6381602402b570eea22d816d517d8bea275da3f..f0c9915b583180e2385b58a1b52ff1099504e1ac 100644 (file)
--- 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}"