[SCM] musescore/master: possibly fix a build system ordering issue

[tg at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit bfc6223f2225ca61e05e14ca062fbe33cd1e61bc
Author: mirabilos <tg at debian.org>
Date:   Sat Aug 5 02:07:30 2017 +0200

    possibly fix a build system ordering issue

diff --git a/debian/changelog b/debian/changelog
index 39bcbcb..b8694f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ musescore (2.1.0+dfsg1-0.1) UNRELEASED; urgency=medium
     - installs higher resolution icons (Closes: #858822)
   * Remove musescore-soundfont-gm transitional package after release
   * Add 01-oss-salsa.patch to perhaps fix kFreeBSD, Hurd builds.
+  * Fix build without PCH copying all.h too late.
 
- -- Thorsten Glaser <tg at mirbsd.de>  Sat, 05 Aug 2017 01:07:56 +0200
+ -- Thorsten Glaser <tg at mirbsd.de>  Sat, 05 Aug 2017 02:07:02 +0200
 
 musescore (2.0.3+dfsg1-2) unstable; urgency=medium
 
diff --git a/debian/patches/02-global-flags.patch b/debian/patches/02-global-flags.patch
index be81168..325620b 100644
--- a/debian/patches/02-global-flags.patch
+++ b/debian/patches/02-global-flags.patch
@@ -9,6 +9,8 @@ Description: Put common flags into CMAKE_CXX_FLAGS
  The PCH build was already not working, but after appplying this patch it fails
  outright (the PCH code ignores CMAKE_CXX_FLAGS and all custom flags) so just
  disable it.
+ However, with that, the all.h copying code is no longer run before AUTOMOC-
+ caused *_autogen targets, so we must run it earlier.
  .
  The flags in mtest are duplicated and inherited from the root CMakeLists.txt
  anyway, so they can be removed.
@@ -44,8 +46,17 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
     endif (MINGW)
  endif(APPLE)
  
-@@ -577,9 +580,7 @@ add_custom_command(
-     DEPENDS ${PROJECT_SOURCE_DIR}/all.h
+@@ -570,16 +573,11 @@ endif (NOT MINGW AND NOT APPLE)
+ #
+ 
+ # all.h is expected in PROJECT_BINARY_DIR by subdirs
+-add_custom_command(
+-    OUTPUT ${PROJECT_BINARY_DIR}/all.h
+-    COMMAND ${CMAKE_COMMAND}
+-    ARGS -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
+-    DEPENDS ${PROJECT_SOURCE_DIR}/all.h
++execute_process(
++    COMMAND ${CMAKE_COMMAND} -E copy ${PROJECT_SOURCE_DIR}/all.h ${PROJECT_BINARY_DIR}/all.h
      WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
      )
 -if (NOT MINGW)

-- 
musescore packaging