[freetype2-demos] master f736c77 34/41: [ftinspect] Format build files for cmake and meson.

[Werner Lemberg]

branch: master
commit f736c77dcd03ab0784724c3d43514b6bb905e360
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    [ftinspect] Format build files for cmake and meson.
    
    * src/ftinspect/CMakeLists.txt, src/ftinspect/meson.build: Do it.
    Also sort entries.
---
 src/ftinspect/CMakeLists.txt | 65 ++++++++++++++++++++++++--------------------
 src/ftinspect/meson.build    | 59 ++++++++++++++++++++++------------------
 2 files changed, 68 insertions(+), 56 deletions(-)

diff --git a/src/ftinspect/CMakeLists.txt b/src/ftinspect/CMakeLists.txt
index 6a7a025..b7072c5 100644
--- a/src/ftinspect/CMakeLists.txt
+++ b/src/ftinspect/CMakeLists.txt
@@ -1,5 +1,6 @@
-cmake_minimum_required (VERSION 3.0)
+cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0074 NEW)
+
 set(CMAKE_CXX_STANDARD 11)
 
 project("ftinspect")
@@ -16,56 +17,62 @@ find_package(Qt5 5.15 COMPONENTS Widgets REQUIRED)
 find_package(Freetype REQUIRED)
 
 add_executable(ftinspect
-  "ftinspect.cpp"
-  "maingui.cpp"
-  "uihelper.cpp"
-  
+  "engine/charmap.cpp"
   "engine/engine.cpp"
   "engine/fontfilemanager.cpp"
-  "engine/rendering.cpp"
-  "engine/paletteinfo.cpp"
-  "engine/mmgx.cpp"
   "engine/fontinfo.cpp"
   "engine/fontinfonamesmapping.cpp"
+  "engine/mmgx.cpp"
+  "engine/paletteinfo.cpp"
+  "engine/rendering.cpp"
   "engine/stringrenderer.cpp"
-  "engine/charmap.cpp"
 
   "glyphcomponents/glyphbitmap.cpp"
   "glyphcomponents/glyphcontinuous.cpp"
   "glyphcomponents/glyphoutline.cpp"
   "glyphcomponents/glyphpointnumbers.cpp"
   "glyphcomponents/glyphpoints.cpp"
-  "glyphcomponents/grid.cpp"
   "glyphcomponents/graphicsdefault.cpp"
-
-  "widgets/customwidgets.cpp"
-  "widgets/tripletselector.cpp"
-  "widgets/glyphindexselector.cpp"
-  "widgets/fontsizeselector.cpp"
-  "widgets/charmapcombobox.cpp"
+  "glyphcomponents/grid.cpp"
 
   "models/customcomboboxmodels.cpp"
   "models/fontinfomodels.cpp"
 
+  "panels/comparator.cpp"
+  "panels/continuous.cpp"
+  "panels/glyphdetails.cpp"
+  "panels/info.cpp"
   "panels/settingpanel.cpp"
   "panels/settingpanelmmgx.cpp"
   "panels/singular.cpp"
-  "panels/continuous.cpp"
-  "panels/comparator.cpp"
-  "panels/info.cpp"
-  "panels/glyphdetails.cpp"
+
+  "widgets/charmapcombobox.cpp"
+  "widgets/customwidgets.cpp"
+  "widgets/fontsizeselector.cpp"
+  "widgets/glyphindexselector.cpp"
+  "widgets/tripletselector.cpp"
+
+  "ftinspect.cpp"
+  "maingui.cpp"
+  "uihelper.cpp"
 )
+
 target_link_libraries(ftinspect
-  Qt5::Core Qt5::Widgets
   Freetype::Freetype
+  Qt5::Core
+  Qt5::Widgets
 )
 
 # Fix for CMake prior to 3.15
-string(REGEX REPLACE "/W[3|4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-if(MSVC)
-  target_compile_options(ftinspect PRIVATE "/W4" "/wd4100")
-else(CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
-     OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-  target_compile_options(ftinspect PRIVATE "-Wall" "-Wextra" 
-                         "-Wpedantic" "-Wno-unused-parameter")
-endif()
+string(REGEX REPLACE
+  "/W[3|4]" ""
+  CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+
+if (MSVC)
+  target_compile_options(ftinspect
+    PRIVATE "/W4" "/wd4100")
+else (CMAKE_CXX_COMPILER_ID STREQUAL "GNU"
+      OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+  target_compile_options(ftinspect
+    PRIVATE "-Wall" "-Wextra" "-Wpedantic" "-Wno-unused-parameter")
+endif ()
diff --git a/src/ftinspect/meson.build b/src/ftinspect/meson.build
index 13a6bf9..1526aca 100644
--- a/src/ftinspect/meson.build
+++ b/src/ftinspect/meson.build
@@ -21,66 +21,71 @@ qt5_dep = dependency('qt5',
 # when cross-compiling to a different system.
 if qt5_dep.found()
   sources = files([
+    'engine/charmap.cpp',
     'engine/engine.cpp',
     'engine/fontfilemanager.cpp',
-    'engine/rendering.cpp',
-    'engine/paletteinfo.cpp',
-    'engine/mmgx.cpp',
     'engine/fontinfo.cpp',
     'engine/fontinfonamesmapping.cpp',
+    'engine/mmgx.cpp',
+    'engine/paletteinfo.cpp',
+    'engine/rendering.cpp',
     'engine/stringrenderer.cpp',
-    'engine/charmap.cpp',
 
     'glyphcomponents/glyphbitmap.cpp',
     'glyphcomponents/glyphcontinuous.cpp',
     'glyphcomponents/glyphoutline.cpp',
     'glyphcomponents/glyphpointnumbers.cpp',
     'glyphcomponents/glyphpoints.cpp',
-    'glyphcomponents/grid.cpp',
     'glyphcomponents/graphicsdefault.cpp',
-
-    'widgets/customwidgets.cpp',
-    'widgets/tripletselector.cpp',
-    'widgets/glyphindexselector.cpp',
-    'widgets/fontsizeselector.cpp',
-    'widgets/charmapcombobox.cpp',
+    'glyphcomponents/grid.cpp',
 
     'models/customcomboboxmodels.cpp',
     'models/fontinfomodels.cpp',
 
+    'panels/comparator.cpp',
+    'panels/continuous.cpp',
+    'panels/glyphdetails.cpp',
+    'panels/info.cpp',
     'panels/settingpanel.cpp',
     'panels/settingpanelmmgx.cpp',
     'panels/singular.cpp',
-    'panels/continuous.cpp',
-    'panels/comparator.cpp',
-    'panels/info.cpp',
-    'panels/glyphdetails.cpp',
+
+    'widgets/charmapcombobox.cpp',
+    'widgets/customwidgets.cpp',
+    'widgets/fontsizeselector.cpp',
+    'widgets/glyphindexselector.cpp',
+    'widgets/tripletselector.cpp',
 
     'ftinspect.cpp',
     'maingui.cpp',
     'uihelper.cpp',
-])
+  ])
 
   moc_files = qt5.preprocess(
     moc_headers: [
       'engine/fontfilemanager.hpp',
+
       'glyphcomponents/glyphbitmap.hpp',
       'glyphcomponents/glyphcontinuous.hpp',
-      'widgets/customwidgets.hpp',
-      'widgets/tripletselector.hpp',
-      'widgets/glyphindexselector.hpp',
-      'widgets/fontsizeselector.hpp',
-      'widgets/charmapcombobox.hpp',
-      'maingui.hpp',
+
       'models/customcomboboxmodels.hpp',
       'models/fontinfomodels.hpp',
+
+      'panels/comparator.hpp',
+      'panels/continuous.hpp',
+      'panels/glyphdetails.hpp',
+      'panels/info.hpp',
       'panels/settingpanel.hpp',
       'panels/settingpanelmmgx.hpp',
       'panels/singular.hpp',
-      'panels/continuous.hpp',
-      'panels/comparator.hpp',
-      'panels/info.hpp',
-      'panels/glyphdetails.hpp',
+
+      'widgets/charmapcombobox.hpp',
+      'widgets/customwidgets.hpp',
+      'widgets/fontsizeselector.hpp',
+      'widgets/glyphindexselector.hpp',
+      'widgets/tripletselector.hpp',
+
+      'maingui.hpp',
     ],
     dependencies: qt5_dep)
 
@@ -88,7 +93,7 @@ if qt5_dep.found()
     sources,
     moc_files,
     dependencies: [qt5_dep, libfreetype2_dep],
-    override_options : ['cpp_std=c++11'],
+    override_options: ['cpp_std=c++11'],
     install: true)
 endif