[ignition-math2] 01/01: Added unconditional c++11 patch

Jose Luis Rivero jrivero-guest at moszumanska.debian.org
Sun Jul 17 16:34:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository ignition-math2.

commit 87e586ee0b250d6ba235b400c681eacb2b565277
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Sun Jul 17 16:33:14 2016 +0000

    Added unconditional c++11 patch
---
 debian/patches/0001-c++11-unconditional.patch | 24 ++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 25 insertions(+)

diff --git a/debian/patches/0001-c++11-unconditional.patch b/debian/patches/0001-c++11-unconditional.patch
new file mode 100644
index 0000000..de990f4
--- /dev/null
+++ b/debian/patches/0001-c++11-unconditional.patch
@@ -0,0 +1,24 @@
+Description: Declare c++11 flag unconditional
+Author: Jose Luis Rivero <jrivero at osrfoundation.org>
+Forwarded: No
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 93f4d1b..3a9a40e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -175,10 +175,14 @@ else()
+   set(WARN_LEVEL "-Wall")
+ endif()
+ 
++if (NOT MSVC)
++  set(UNFILTERED_FLAGS "-Wc++11-compat -std=c++11")
++endif()
++
+ filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
+   -Wno-unused-value -Wno-unused-value -Wno-unused-value -Wno-unused-value
+   -Wfloat-equal -Wshadow -Winit-self -Wswitch-default
+-  -Wmissing-include-dirs -pedantic)
++  -Wmissing-include-dirs -pedantic ${UNFILTERED_FLAGS})
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}${WARNING_CXX_FLAGS}")
+ if (DEFINED EXTRA_CMAKE_CXX_FLAGS)
+   set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_CMAKE_CXX_FLAGS}")
diff --git a/debian/patches/series b/debian/patches/series
index 3330145..c937450 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-c++11-unconditional.patch
 0002_use_system_gtest.patch
 0003_fix_collinear_boundary.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-math2.git



More information about the debian-science-commits mailing list