[SCM] musescore/master: patch: put common flags into CMAKE_CXX_FLAGS

[jcowgill at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit a8e2e291d465df79e09a6ac20fa004ac1b2cf1c7
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Jul 7 22:29:57 2016 +0200

    patch: put common flags into CMAKE_CXX_FLAGS

diff --git a/debian/patches/02-global-flags.patch b/debian/patches/02-global-flags.patch
new file mode 100644
index 0000000..86abffa
--- /dev/null
+++ b/debian/patches/02-global-flags.patch
@@ -0,0 +1,65 @@
+Description: Put common flags into CMAKE_CXX_FLAGS
+ Debhelper intentionally sets CMAKE_BUILD_TYPE to None so that optimization
+ flags are not added by cmake. Unfortunately musescore only enables --std=c++11
+ for the Debug and Release build types.
+ .
+ This patch moves the common flags (c++ standard, warnings, etc) to
+ CMAKE_CXX_FLAGS which gets used in all build types.
+ .
+ The flags in mtest are duplicated and inherited from the root CMakeLists.txt
+ anyway.
+Author: James Cowgill <jcowgill at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -148,17 +148,20 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "
+ endif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+ 
+ if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
++   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override")
++   set(CMAKE_CXX_FLAGS_DEBUG   "-g")
++   set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
+ else (APPLE)
+    if (MINGW)
+       # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -mno-ms-bitfields")
++      set(CMAKE_CXX_FLAGS_DEBUG   "-g")
++      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
+       set(CMAKE_EXE_LINKER_FLAGS "-Wl,--large-address-aware")
+    else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++11 -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=c++11 -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
++      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
++      set(CMAKE_CXX_FLAGS_DEBUG   "-fPIE -g")
++      set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -DQT_NO_DEBUG")
+    endif (MINGW)
+ endif(APPLE)
+ 
+--- a/mtest/CMakeLists.txt
++++ b/mtest/CMakeLists.txt
+@@ -112,20 +112,6 @@ target_link_libraries(
+ 
+ set(CMAKE_CXX_FLAGS         "${CMAKE_CXX_FLAGS} ${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
+ 
+-if (APPLE)
+-   set(CMAKE_CXX_FLAGS_DEBUG   "-std=c++0x -fPIC -stdlib=libc++ -g -Wno-inconsistent-missing-override")
+-   set(CMAKE_CXX_FLAGS_RELEASE "-std=c++0x -fPIC -stdlib=libc++ -O2 -DNDEBUG -DQT_NO_DEBUG -Wno-inconsistent-missing-override")
+-else (APPLE)
+-   if (MINGW)
+-      # -mno-ms-bitfields see #22048
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -mno-ms-bitfields -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -mno-ms-bitfields -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   else (MINGW)
+-      set(CMAKE_CXX_FLAGS_DEBUG   "-std=gnu++0x -fPIC -fPIE -g")
+-      set(CMAKE_CXX_FLAGS_RELEASE "-std=gnu++0x -fPIC -O2 -DNDEBUG -DQT_NO_DEBUG")
+-   endif (MINGW)
+-endif(APPLE)
+-
+ 
+ string(REPLACE ";" ";-I" INC "${QT_INCLUDES}")
+ 
diff --git a/debian/patches/series b/debian/patches/series
index f5ad673..41b63c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 01-debundle-freetype.patch
+02-global-flags.patch

-- 
musescore packaging