From: Russ Combs (rucombs) <rucombs@cisco.com>
Date: Fri, 29 Apr 2016 12:32:53 +0000 (-0400)
Subject: fix cmake c std and packaging
X-Git-Tag: 3.0.0-233~413^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c652a633a0eaf41c0cb4bbf15dbc757560064fa3;p=thirdparty%2Fsnort3.git

fix cmake c std and packaging
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 193c403c5..3241abdf1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,6 +34,9 @@ add_definitions( -DHAVE_CONFIG_H )
 # set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
 
+# FIXIT - there is probably a better way to do this
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+
 include_directories (${PROJECT_BINARY_DIR})
 include_directories (${PROJECT_SOURCE_DIR})
 
diff --git a/cmake/packaging_data.cmake b/cmake/packaging_data.cmake
index 2f826ef4d..87c164e11 100644
--- a/cmake/packaging_data.cmake
+++ b/cmake/packaging_data.cmake
@@ -1,6 +1,3 @@
-add_custom_target( dist
-    COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target package_source
-)
 
 set (AUTOTOOL_FILES "autom4te.cache;m4;configure.ac;Makefile.am")
 
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index 4cdf5f571..db9e1ecce 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -2,3 +2,26 @@ cmake_minimum_required ( VERSION 2.8.11 )
 project( snort_extra CXX C )
 
 add_subdirectory ( src )
+
+set (EXTRA_VERSION_MAJOR 1)
+set (EXTRA_VERSION_MINOR 0)
+set (EXTRA_VERSION_BUILD 0-a4)
+
+set (AUTOTOOL_FILES "autom4te.cache;m4;configure.ac;Makefile.am")
+
+set (CPACK_GENERATOR TGZ)
+set (CPACK_PACKAGE_NAME "snort_extra")
+set (CPACK_PACKAGE_VENDOR "Cisco")
+set (CPACK_PACKAGE_VERSION_MAJOR "${EXTRA_VERSION_MAJOR}")
+set (CPACK_PACKAGE_VERSION_MINOR "${EXTRA_VERSION_MINOR}")
+set (CPACK_PACKAGE_VERSION_PATCH "${EXTRA_VERSION_BUILD}")
+set (CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/doc/images/snort.png")
+set (CPACK_PACKAGE_INSTALL_DIRECTORY "snort")
+set (CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
+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 "${AUTOTOOL_FILES}")
+set (CPACK_SOURCE_GENERATOR TGZ)
+
+include(CPack)
+