freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2-demos] gsoc-2022-chariri-2 1217e11 12/30: * src/ftinspect/mes


From: Werner Lemberg
Subject: [freetype2-demos] gsoc-2022-chariri-2 1217e11 12/30: * src/ftinspect/meson.build: Fix meson for `ftinspect`.
Date: Mon, 11 Jul 2022 07:17:38 -0400 (EDT)

branch: gsoc-2022-chariri-2
commit 1217e11e409423388885a75cda8db8a9c24051aa
Author: Charlie Jiang <w@chariri.moe>
Commit: Charlie Jiang <w@chariri.moe>

    * src/ftinspect/meson.build: Fix meson for `ftinspect`.
    
    Fixed meson script which were broken due to automerging.
    
    Also fixed `moc_headers` where some `hpp`s were mistyped as `cpp` and some
    other missing headers was added.
---
 src/ftinspect/meson.build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/ftinspect/meson.build b/src/ftinspect/meson.build
index 4658e9d..47f0cc3 100644
--- a/src/ftinspect/meson.build
+++ b/src/ftinspect/meson.build
@@ -32,7 +32,7 @@ if qt5_dep.found()
 
     'models/ttsettingscomboboxmodel.cpp',
 
-    'panels/settingpanel.cpp'
+    'panels/settingpanel.cpp',
 
     'ftinspect.cpp',
     'maingui.cpp',
@@ -40,9 +40,10 @@ if qt5_dep.found()
 
   moc_files = qt5.preprocess(
     moc_headers: [
+      'engine/fontfilemanager.hpp',
       'widgets/custom_widgets.hpp',
-      'models/ttsettingscomboboxmodel.cpp',
-      'panels/settingpanel.cpp',
+      'models/ttsettingscomboboxmodel.hpp',
+      'panels/settingpanel.hpp',
       'maingui.hpp',
     ],
     dependencies: qt5_dep)
@@ -51,6 +52,7 @@ if qt5_dep.found()
     sources,
     moc_files,
     dependencies: [qt5_dep, libfreetype2_dep],
+    override_options : ['cpp_std=c++11'],
     install: true)
 endif
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]