[pangomm/use-dllexport-2-42] Meson: Change use_dll_export to build_shared_libs_directly



commit f5516bde6a3fdc7c18b8172b6bb275ca3f22a000
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Mar 19 18:17:25 2020 +0800

    Meson: Change use_dll_export to build_shared_libs_directly
    
    It turns out that we want to build shared libraries directly on all
    non-Visual Studio builds.

 meson.build               | 10 ++++++----
 pango/pangomm/meson.build |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/meson.build b/meson.build
index 2b19bae..d709991 100644
--- a/meson.build
+++ b/meson.build
@@ -139,12 +139,12 @@ if is_msvc
   endforeach
 
   # Check whether we compile pangomm without using gendef
-  use_dll_export = false
+  build_shared_libs_directly = false
 
   # If we are building using maintainer mode, check whether we are on 2.64.0 or later
   if glibmm_dep.type_name() == 'pkgconfig'
     if glibmm_dep.version() >= '2.64.0' and maintainer_mode
-      use_dll_export = true
+      build_shared_libs_directly = true
     endif
   elif glibmm_dep.type_name() == 'library'
     warning('Note: Be sure to check that this finds the same libsigc++ .lib your glibmm is linked to')
@@ -159,7 +159,7 @@ if is_msvc
          prefix: '#include <glibmm/miscutils.h>',
          dependencies: glibmm_dep
        )
-      use_dll_export = true
+      build_shared_libs_directly = true
     endif
   endif
 
@@ -191,6 +191,8 @@ else
     'cairomm-1.@0@'.format(cairomm_req_minor_ver), cairomm_req,
     'pangocairo', pangocairo_req,
   ])
+
+  build_shared_libs_directly = true
 endif
 
 if is_msvc and not maintainer_mode
@@ -214,7 +216,7 @@ else:
 
   # Enable __declspec(dllexport) if the pangomm headers generated from the .hg files
   # were generated using gmmproc from glibmm-2.64.0 or later
-  use_dll_export = run_command(python3, '-c', check_gmmproc_ver_cmd).returncode() == 0
+  build_shared_libs_directly = run_command(python3, '-c', check_gmmproc_ver_cmd).returncode() == 0
 endif
 
 # Some dependencies are required only in maintainer mode and/or if
diff --git a/pango/pangomm/meson.build b/pango/pangomm/meson.build
index cbfa75e..1d85190 100644
--- a/pango/pangomm/meson.build
+++ b/pango/pangomm/meson.build
@@ -67,7 +67,7 @@ src_untracked_pangomm = project_source_root / untracked_pangomm
 
 pangomm_cpp_args = [ '-DPANGOMM_BUILD=1' ]
 
-if is_msvc and not use_dll_export
+if is_msvc and not build_shared_libs_directly
   pangomm_cpp_args += '-DPANGOMM_USE_GENDEF'
 endif
 


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