another cmake update. fixing a minor build bug

diff --git a/cmake/FindAsciidoc.cmake b/cmake/FindAsciidoc.cmake
index 1a1eb584ed46c391d5e2ef685eb11252339764c4..72ccf164f85744038c4518d7995be3b2ca77d605 100644 (file)
--- a/cmake/FindAsciidoc.cmake
+++ b/cmake/FindAsciidoc.cmake
@@ -4,7 +4,6 @@
 # ASCIIDOC_A2X_EXE - the full path to asciidoc's a2x
 # ASCIIDOC_EXE -  the full path to asciidoc's asciidoc command
 # Asciidoc_FOUND - If false, don't attempt to use asciidoc.
-#
 
 set(ERROR_MESSAGE
     "Unable to find Asciidoc.  Dowbnload and install AsciiDoc to create

diff --git a/cmake/FindLuaJIT.cmake b/cmake/FindLuaJIT.cmake
index 1641e3e59c204baf9a4f4b1cc8fcd381f159f0fd..f76a203b0f4c835d1ef3197c2f455217c8fde9ba 100644 (file)
--- a/cmake/FindLuaJIT.cmake
+++ b/cmake/FindLuaJIT.cmake
@@ -1,6 +1,4 @@
 #
-#  FILE TAKEN FROM https://github.com/msva/lua-curl/blob/master/cmake/Modules/FindLuaJIT.cmake
-#
 # Locate LuaJIT library
 # This module defines
 #  LUAJIT_FOUND, if false, do not try to link to Lua

diff --git a/cmake/FindPCAP.cmake b/cmake/FindPCAP.cmake
index 80ca67f338667c0a4c9dbd053c517c432f2992f2..bccf4249204d8df5a5cf5e2489cbe3b07a8bb957 100644 (file)
--- a/cmake/FindPCAP.cmake
+++ b/cmake/FindPCAP.cmake
@@ -1,6 +1,3 @@
-#  Taken from 
-#  some code https://github.com/bro/cmake/blob/master/FindPCAP.cmake
-#
 #
 # - Try to find libpcap include dirs and libraries
 #

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index b102294bb8f4b2c9de066d965e6a56a4b29e6b44..1431c24340a8d7ca32ef3943c526261e5818ce83 100644 (file)
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -1,4 +1,5 @@
 
+# use this target instead of 'make package_source'
 add_custom_target(dist
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target copy_manuals_to_source
     COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package_source

diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 7e192bdee60e64625e95f63ae8214814e4f57464..8b9967318c3c9c678fe1044688dd4e662d22773e 100644 (file)
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -333,8 +333,7 @@ foreach (file ${EXTRA_DIST})
     list(APPEND EXTRA_DIST_BUILT "${CMAKE_CURRENT_BINARY_DIR}/${file}")
 endforeach(file)
 
-
-add_custom_target(snort_manuals ALL DEPENDS ${EXTRA_DIST})
+add_custom_target(snort_manuals ALL DEPENDS ${EXTRA_DIST_BUILT})
 install (FILES ${EXTRA_DIST_BUILT} DESTINATION "${SNORT_DATA_DIR}")
 install (FILES ${EXTRA_DIST_PACKAGED} DESTINATION "${SNORT_DATA_DIR}")
 install (FILES ${UNBUILT_SOURCES} DESTINATION "${SNORT_DATA_DIR}")