minor cpack tweak --- build directories will no be included. Use packaging script...

diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index bf16ae0c306cb79e7c622663c4130b5ea62cea72..668eef453fef06f5bca0cb12215417976b18cb58 100644 (file)
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -32,7 +32,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/doc/start.txt")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;autom4te.cache;m4")
+set (CPACK_SOURCE_IGNORE_FILES "tools/snort2lua/tests/;\\\\.git/;\\\\.gitignore;extra/;autom4te.cache;m4")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)

diff --git a/extra/packaging_data.cmake b/extra/packaging_data.cmake
index f70ec2859d7b40a6e4b140976c2d10e99af13e5f..0ca27e1006c9d287985dca135811eff2f59b0ef4 100644 (file)
--- a/extra/packaging_data.cmake
+++ b/extra/packaging_data.cmake
@@ -28,7 +28,7 @@ set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
 set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
 set (CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README")
 set (CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set (CPACK_SOURCE_IGNORE_FILES "${CMAKE_BINARY_DIR}/;autom4te.cache;m4;")
+set (CPACK_SOURCE_IGNORE_FILES "autom4te.cache;m4;")
 set (CPACK_SOURCE_GENERATOR TGZ)
 
 include(CPack)

diff --git a/src/filters/CMakeLists.txt b/src/filters/CMakeLists.txt
index 9d77ec749206f465fa99315d2bc0ce50c866080d..3dfdca8367b587bc9f1f0b551a22d945d978a5c5 100644 (file)
--- a/src/filters/CMakeLists.txt
+++ b/src/filters/CMakeLists.txt
@@ -3,7 +3,7 @@ set (FILTER_INCLUDES
     sfrf.h 
 )
 
-add_library ( filter STATIC
+add_library (filter STATIC
     detection_filter.cc
     detection_filter.h
     rate_filter.cc

diff --git a/src/flow/CMakeLists.txt b/src/flow/CMakeLists.txt
index 66aff707bf31c6e888b5c7f08b8cdcad9eb8939f..3889e5745d57dcba8b8553cfe94b579471e14346 100644 (file)
--- a/src/flow/CMakeLists.txt
+++ b/src/flow/CMakeLists.txt
@@ -5,7 +5,7 @@ set (FLOW_INCLUDES
     flow_key.h
 )
 
-add_library ( flow STATIC
+add_library (flow STATIC
     ${FLOW_INCLUDES}
     flow.cc 
     flow_key.cc 

diff --git a/src/log/CMakeLists.txt b/src/log/CMakeLists.txt
index c24471ac2ed560f623c450b5657de9f9a625fbfa..eb653591033db4fb7372dbe0e659a6b805bbdecf 100644 (file)
--- a/src/log/CMakeLists.txt
+++ b/src/log/CMakeLists.txt
@@ -17,7 +17,7 @@ add_library ( log STATIC
     text_log.cc
 )
 
-set_default_visibility_compile_flag( log )
+set_default_visibility_compile_flag(log)
 
 
 install(FILES ${LOG_INCLUDES}