summaryrefslogtreecommitdiffstats
path: root/package/solarus/0001-cmake-remove-Werror.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/solarus/0001-cmake-remove-Werror.patch')
-rw-r--r--package/solarus/0001-cmake-remove-Werror.patch27
1 files changed, 13 insertions, 14 deletions
diff --git a/package/solarus/0001-cmake-remove-Werror.patch b/package/solarus/0001-cmake-remove-Werror.patch
index b27908c829..533ac91c7d 100644
--- a/package/solarus/0001-cmake-remove-Werror.patch
+++ b/package/solarus/0001-cmake-remove-Werror.patch
@@ -1,27 +1,26 @@
-From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001
+From 5f372ba3502369c6501c77650a761300d26f64c0 Mon Sep 17 00:00:00 2001
From: Romain Naour <romain.naour@gmail.com>
Date: Thu, 22 Jun 2017 00:19:56 +0200
Subject: [PATCH] cmake: remove Werror
Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
- cmake/AddCompilationFlags.cmake | 3 ---
- 1 file changed, 3 deletions(-)
+ cmake/AddCompilationFlags.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake
-index 5159ff9..a506033 100644
+index 2c105db7f..cb5c5719a 100644
--- a/cmake/AddCompilationFlags.cmake
+++ b/cmake/AddCompilationFlags.cmake
-@@ -24,9 +24,6 @@ endif()
- # Be less pedantic in release builds for users.
- set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}")
+@@ -25,7 +25,7 @@ endif()
+ set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE} -O3")
--# Be more pedantic in debug mode for developers.
--set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}")
--
- # Platform-specific flags.
- if(WIN32)
- # MinGW: disable the console by default.
+ # Be more pedantic in debug mode for developers.
+-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -Wno-error=deprecated-declarations -pedantic ${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
++set(CMAKE_CXX_FLAGS_DEBUG "-Wno-error -Wall -Wextra -Wno-error=deprecated-declarations -pedantic ${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Wsuggest-override")
+ endif()
--
-2.9.4
+2.14.5
OpenPOWER on IntegriCloud