From 0dffcec461fb0a3eb04419980cde2bf1c644682b Mon Sep 17 00:00:00 2001
From: woclass <5158738+inkydragon@users.noreply.github.com>
Date: Mon, 24 May 2021 21:47:34 +0800
Subject: [PATCH] Fix meson warning (#126)

* [git] ignore IDE setting, Meson subprojects

* [win_installer] rename *.mo -> *.gmo

* [win_installer] only add aeg translations

* [win_installer] split aeg/wx translations

* [win_installer] gen & pack translations

* [git] ignore hunspell source dir

* [git] ignore uchardet source dir

* [test] Generate the test executable

run with `meson test`

* [test] add tools to remove test data files

`unset.bat FULL_PATH`

* [test] set to correct Error type

* [test] Set Source character sets to UTF-8 for MSVC

* [test] move test data files to build_root

* [meson/wxWidgets] fix warning: deprecated feature `cmake_options`

* [meson] fix warning:  msvc does not support C++11

* [meson/fribidi] add original meson.build file

* [meson/fribidi] merge pr-151

https://github.com/fribidi/fribidi/pull/151
"meson: add fribidi_static_cargs to extra_cflags"

* [meson/fribidi] fix DEPRECATION

"Library fribidi was passed to the "libraries" keyword argument of a previous call to generate() method instead of first positional argument."

* [git]  rm IDE dir

* [meson] remove old flags

* [meson] fixed in upstream
---
 meson.build | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index 3edcd25d2..54ad3ee61 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,7 @@
 project('Aegisub', ['c', 'cpp'],
         license: 'BSD-3-Clause',
         meson_version: '>=0.56.1',
-        default_options: ['cpp_std=c++11', 'buildtype=debugoptimized'],
+        default_options: ['cpp_std=c++14', 'buildtype=debugoptimized'],
         version: '3.2.2')
 
 cmake = import('cmake')
@@ -122,22 +122,29 @@ wx_dep = dependency('wxWidgets', version: wx_minver,
 if wx_dep.found()
     deps += wx_dep
 else
-    build_shared = 'ON'
+    build_shared = true
     if get_option('default_library') == 'static'
-        build_shared = 'OFF'
+        build_shared = false
     endif
     build_type = 'Release'
     if get_option('buildtype') == 'debug'
         build_type = 'Debug'
     endif
 
-    wx = cmake.subproject('wxWidgets', cmake_options: ['-DwxBUILD_INSTALL=OFF',
-                                                       '-DwxBUILD_PRECOMP=OFF', # otherwise breaks project generation w/ meson
-                                                       '-DwxBUILD_SHARED=@0@'.format(build_shared),
-                                                       '-DwxUSE_WEBVIEW=OFF', # breaks build on linux
-                                                       '-DCMAKE_BUILD_TYPE=@0@'.format(build_type),
-                                                       '-DwxUSE_IMAGE=ON',
-                                                       '-DwxBUILD_MONOLITHIC=ON']) # otherwise breaks project generation w/ meson
+    opt_var = cmake.subproject_options()
+    opt_var.add_cmake_defines({
+        'wxBUILD_INSTALL': false,
+        'wxBUILD_PRECOMP': false,       # otherwise breaks project generation w/ meson
+        'wxBUILD_SHARED': build_shared,
+
+        'wxUSE_WEBVIEW': false,         # breaks build on linux
+        'CMAKE_BUILD_TYPE': build_type,
+        'wxUSE_IMAGE': true,
+        'wxBUILD_MONOLITHIC': true      # otherwise breaks project generation w/ meson
+    })
+
+    wx = cmake.subproject('wxWidgets', options: opt_var)
+
     deps += [
         wx.dependency('wxmono'),
         wx.dependency('wxregex'),