[pangomm/pangomm-2-42.meson-msvc: 3/3] meson: Build generate_extra_defs with Visual Studio too
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pangomm/pangomm-2-42.meson-msvc: 3/3] meson: Build generate_extra_defs with Visual Studio too
- Date: Thu, 27 Feb 2020 04:01:31 +0000 (UTC)
commit 3a08e7fa1b3fa94e8e95261b4dfc98679e295226
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Thu Feb 27 11:58:34 2020 +0800
meson: Build generate_extra_defs with Visual Studio too
The NMake Makefiles in glibmm now builds glibmm_generate_extra_defs-2.x.lib,
so we can make use of it to build generate_extra_defs on Visual Studio too.
tools/extra_defs_gen/meson.build | 16 +++++++---------
1 file changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/tools/extra_defs_gen/meson.build b/tools/extra_defs_gen/meson.build
index 9be9d1e..6a758cf 100644
--- a/tools/extra_defs_gen/meson.build
+++ b/tools/extra_defs_gen/meson.build
@@ -3,16 +3,14 @@
# Input: cpp_compiler, pangomm_build_dep, install_libdir, pangomm_pcname
# Output: m4_files, install_m4dir
-if not is_msvc
- glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
- 'glibmm_generate_extra_defs-2.4',
- )
+glibmm_generate_extra_defs_dep = cpp_compiler.find_library(
+ 'glibmm_generate_extra_defs-2.4',
+)
- executable('generate_extra_defs', 'generate_defs_pango.cc',
- dependencies: [pangomm_build_dep, glibmm_generate_extra_defs_dep],
- install: false,
- )
-endif
+executable('generate_extra_defs', 'generate_defs_pango.cc',
+ dependencies: [pangomm_build_dep, glibmm_generate_extra_defs_dep],
+ install: false,
+)
# Install m4 files for reuse by other *mm projects, when building from git.
m4_basefiles = [
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]