[ignition-math4] 04/04: Update patches

[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 ignition-math4.

commit 5bb867c0a2d63f81c067ceb149f55387686e63d1
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Nov 20 19:51:15 2017 +0000

    Update patches
---
 debian/patches/0001-c++11-unconditional.patch | 24 ------------------------
 debian/patches/0002_use_system_gtest.patch    | 13 -------------
 debian/patches/series                         |  1 -
 3 files changed, 38 deletions(-)

diff --git a/debian/patches/0001-c++11-unconditional.patch b/debian/patches/0001-c++11-unconditional.patch
deleted file mode 100644
index de990f4..0000000
--- a/debian/patches/0001-c++11-unconditional.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-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/0002_use_system_gtest.patch b/debian/patches/0002_use_system_gtest.patch
index 3363769..3fd034b 100644
--- a/debian/patches/0002_use_system_gtest.patch
+++ b/debian/patches/0002_use_system_gtest.patch
@@ -25,16 +25,3 @@ Index: ignition-math2-2.1.1/test/CMakeLists.txt
  target_link_libraries(gtest_main gtest)
  set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
  set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
-
-diff --git a/cmake/Utils.cmake b/cmake/Utils.cmake
-index 4bca480..8845a39 100644
---- a/cmake/Utils.cmake
-+++ b/cmake/Utils.cmake
-@@ -147,7 +147,6 @@ endmacro()
- # This should be migrated to more fine control solution based on set_property APPEND
- # directories. It's present on cmake 2.8.8 while precise version is 2.8.7
- link_directories(${PROJECT_BINARY_DIR}/test)
--include_directories("${PROJECT_SOURCE_DIR}/test/gtest/include")
- 
- #################################################
- # Enable tests compilation by default
diff --git a/debian/patches/series b/debian/patches/series
index abc432b..86bd01e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-0001-c++11-unconditional.patch
 0002_use_system_gtest.patch
 0004_test_failures_in_non_x64_arches.patch

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