[ignition-transport] 01/01: Back to setup the c++11 patch. Needed for building.
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Wed Nov 18 19:23:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository ignition-transport.
commit f7b46c45289808a2b5abec8fef8d0ab028af1d01
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Wed Nov 18 20:22:32 2015 +0100
Back to setup the c++11 patch. Needed for building.
---
debian/patches/0001-c++11_unconditional | 32 ++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 33 insertions(+)
diff --git a/debian/patches/0001-c++11_unconditional b/debian/patches/0001-c++11_unconditional
new file mode 100644
index 0000000..2439a5f
--- /dev/null
+++ b/debian/patches/0001-c++11_unconditional
@@ -0,0 +1,32 @@
+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 c54c198..40f1cdd 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -195,6 +195,7 @@ else()
+
+ # Unable to be filtered flags (failing due to limitations in filter_valid_compiler_warnings)
+ set(UNFILTERED_FLAGS "-Wc++11-compat")
++ set(UNFILTERED_FLAGS "-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
index b6b9d10..71969d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+0001-c++11_unconditional
0003-respect-cmake-c-flags.patch
0004_use_system_gtest.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-transport.git
More information about the debian-science-commits
mailing list