[SCM] musescore/master: Disable precompiled headers

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Thu Jul 14 12:23:06 UTC 2016


The following commit has been merged in the master branch:
commit edc22541260edee3403a9e084bd3ec43420aa75c
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Thu Jul 14 12:31:10 2016 +0100

    Disable precompiled headers
    
    Precompiled headers already didn't work, but after the global flags patch it
    errors out, so just disable it for now.

diff --git a/debian/patches/02-global-flags.patch b/debian/patches/02-global-flags.patch
index 86abffa..13890d1 100644
--- a/debian/patches/02-global-flags.patch
+++ b/debian/patches/02-global-flags.patch
@@ -7,7 +7,11 @@ Description: Put common flags into CMAKE_CXX_FLAGS
  CMAKE_CXX_FLAGS which gets used in all build types.
  .
  The flags in mtest are duplicated and inherited from the root CMakeLists.txt
- anyway.
+ anyway, so they can be removed.
+ .
+ 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.
 Author: James Cowgill <jcowgill at debian.org>
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
@@ -40,6 +44,15 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
     endif (MINGW)
  endif(APPLE)
  
+@@ -557,7 +560,7 @@ add_custom_command(
+ if (MINGW)
+   set(BUILD_PCH false)
+ else (MINGW)
+-  set(BUILD_PCH true)
++  set(BUILD_PCH false)
+ endif(MINGW)
+ 
+ precompiled_header(QT_INCLUDES all ${BUILD_PCH})
 --- a/mtest/CMakeLists.txt
 +++ b/mtest/CMakeLists.txt
 @@ -112,20 +112,6 @@ target_link_libraries(

-- 
musescore packaging



More information about the pkg-multimedia-commits mailing list