[sdformat] 06/07: Patch to use c++11 unconditionally

[Jose Luis Rivero]

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

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

commit 75bc649d036d86b0b21e07214f21e9a9ae13f85f
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Wed Jul 15 02:50:31 2015 +0000

    Patch to use c++11 unconditionally
---
 debian/patches/0001-c++11-unconditional.patch | 33 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 2 files changed, 34 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..44c10d6
--- /dev/null
+++ b/debian/patches/0001-c++11-unconditional.patch
@@ -0,0 +1,33 @@
+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 c2cbef3..2024501 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -173,7 +173,7 @@ else()
+   list(APPEND WARN_LEVEL -Wunused-variable -Wvolatile-register-var)
+ 
+   # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
+-  set(UNFILTERED_FLAGS "-Wc++11-compat")
++  set(UNFILTERED_FLAGS "-Wc++11-compat -std=c++11")
+ endif()
+ 
+ filter_valid_compiler_warnings(${WARN_LEVEL} -Wextra -Wno-long-long
+diff --git a/cmake/DefaultCFlags.cmake b/cmake/DefaultCFlags.cmake
+index 0903872..aaaaf5b 100644
+--- a/cmake/DefaultCFlags.cmake
++++ b/cmake/DefaultCFlags.cmake
+@@ -36,11 +36,6 @@ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
+ 
+-# Visual Studio enables c++11 support by default
+-if (NOT MSVC)
+-  set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}} -std=c++11")
+-endif()
+-
+ if (UNIX)
+     set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
+     set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_LINK_FLAGS_${CMAKE_BUILD_TYPE_UPPERCASE}}")
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..667a3d8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-c++11-unconditional.patch

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