From: jrosenba <jrosenba@JROSENBA-M-D017.CISCO.COM>
Date: Fri, 18 Apr 2014 14:03:01 +0000 (-0400)
Subject: Dynamically checking and adding correct CXX11 compiler flags
X-Git-Tag: 3.0.0-233~1563
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=535023af9f4d86aa3bfeed058ec2aabc43090458;p=thirdparty%2Fsnort3.git

Dynamically checking and adding correct CXX11 compiler flags
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4aabda68a..612bfc415 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,11 +4,7 @@ project(snort CXX C)
 
 set(SNORT_VERSION_MAJOR 2)
 set(SNORT_VERSION_MINOR 10)
-set(SNORT_VERSION_BUILD  044)
-
-# minimum requirement is std11
-list (APPEND CMAKE_CFLAGS "${CFLAGS} -std=c++11 ")
-list (APPEND CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
+set(SNORT_VERSION_BUILD  073)
 
 # ensure cmake will look in the cmake directory for configuration files
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
@@ -20,6 +16,9 @@ include (cmake/setConfigureOptions.txt)
 include (cmake/includePredefinedPackages.txt)
 include (cmake/sanityChecks.txt)
 
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX11_COMPILER_FLAGS}")
+
+# include this directory for the config.h file
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 
 add_subdirectory(etc)
@@ -30,6 +29,7 @@ add_subdirectory(doc)
 
 
 # uninstall target
+
 configure_file(
     "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
     "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"