sigc++.pc.in: Set -DLIBSIGCXX_STATIC in cxxflags as needed

fanc999-1 · kjellahl · commit a064106b2cb9 · 2023-06-26T11:11:32.000+02:00
Update the Meson build files to put in -DLIBSIGCXX_STATIC when we are building
a static build of libsigc++.

For the autotools build, this is not used.
diff --git a/configure.ac b/configure.ac
@@ -83,6 +83,8 @@ AS_IF([test "x$enable_benchmark" = xyes],[
   AX_BOOST_TIMER
 ])
 
+AC_SUBST(MSVC_STATIC_CXXFLAG, '')
+
 AC_CONFIG_FILES([Makefile
                  ${SIGCXX_MODULE_NAME}.pc:sigc++.pc.in
                  ${SIGCXX_MODULE_NAME}-uninstalled.pc:sigc++-uninstalled.pc.in
diff --git a/meson.build b/meson.build
@@ -189,6 +189,7 @@ add_project_arguments(warning_flags, language: 'cpp')
 
 # MSVC: Ignore warnings that aren't really harmful, but make those
 #       that should not be overlooked stand out.
+static_cxxflag = '-DLIBSIGCXX_STATIC'
 if is_msvc
   disable_warnings_list = [
     '/EHsc',  # avoid warnings caused by exception handling model used
@@ -213,7 +214,7 @@ if is_msvc
     language: 'cpp'
   )
   if is_msvc_static
-    add_project_arguments(['-DLIBSIGCXX_STATIC'], language: 'cpp')
+    add_project_arguments(static_cxxflag, language: 'cpp')
   endif
 endif
 
@@ -243,6 +244,7 @@ foreach conf_test : ['gcc_template_specialization_operator_overload',
     pkg_conf_data.set('SIGC_' + conf_test.to_upper(), true)
   endif
 endforeach
+pkg_conf_data.set('MSVC_STATIC_CXXFLAG', is_msvc_static ? static_cxxflag : '')
 
 configure_file(
   input: 'sigc++.pc.in',
diff --git a/sigc++.pc.in b/sigc++.pc.in
@@ -15,4 +15,4 @@ Description: Typesafe signal and callback system for C++
 Version: @PACKAGE_VERSION@
 URL: https://libsigcplusplus.github.io/libsigcplusplus/
 Libs: -L${libdir} -lsigc-@SIGCXX_API_VERSION@
-Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include
+Cflags: -I${includedir}/sigc++-@SIGCXX_API_VERSION@ -I${libdir}/sigc++-@SIGCXX_API_VERSION@/include @MSVC_STATIC_CXXFLAG@
