Repository :
http://git.fedorahosted.org/cgit/firewalld-recode.git
On branch : master
---------------------------------------------------------------
commit edf49915a6cad2399fda5a93b7b066ff94c3069b
Author: Daniel Kopecek <dkopecek(a)redhat.com>
Date: Wed Aug 20 13:28:49 2014 +0200
Set the c++11 and pthread flags in CMakeLists.txt, not in build.sh
---------------------------------------------------------------
CMakeLists.txt | 2 ++
build.sh | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 96a7f92..6d7656c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,8 @@ include_directories(${GLIBMM_INCLUDE_DIRS})
include_directories(${GIOMM_INCLUDE_DIRS})
include_directories(${EXPAT_INCLUDE_DIRS})
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -pthread")
+
#
# Compile main components
#
diff --git a/build.sh b/build.sh
index c264d3d..4e5c96e 100755
--- a/build.sh
+++ b/build.sh
@@ -1,12 +1,12 @@
#!/bin/sh
set -e -o pipefail
-BUILDDIR="build-$(uname -m)-$(uname -s)-$(id -u)"
+BUILDDIR="_build"
rm -rf "${BUILDDIR}"
mkdir "${BUILDDIR}"
pushd "${BUILDDIR}"
-cmake -DCMAKE_BUILD_TYPE:STRING=Debug -DCMAKE_CXX_FLAGS:STRING="-std=c++11" ..
+cmake -DCMAKE_BUILD_TYPE:STRING=Debug ..
time make
echo
popd