2 commits - meson.build

[GitLab Mirror]

 meson.build |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 02754405330989198548d1945b3c55566ba0c6b7
Merge: 5338d3f50 5dc457fa9
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Jul 18 22:32:13 2024 +0000

    Merge branch 'bugfix/compile-without-cpp' into 'master'
    
    meson: only require cpp for windows
    
    See merge request cairo/cairo!573

commit 5dc457fa92cc1e207f15bbd7a06c0fadea032b1f
Author: Thomas Devoogdt <thomas.devoogdt at gmail.com>
Date:   Thu Jul 18 10:29:19 2024 +0000

    meson: only require cpp for windows
    
    Allow to compile meson without c++ toolchain.
    
    Fixes:
     - https://lore.kernel.org/buildroot/20240717200926.1a7db2a1@windsurf/
    
    Signed-off-by: Thomas Devoogdt <thomas.devoogdt at barco.com>

diff --git a/meson.build b/meson.build
index 7ef12fe97..fa8745cc1 100644
--- a/meson.build
+++ b/meson.build
@@ -1,4 +1,4 @@
-project('cairo', 'c', 'cpp',
+project('cairo', 'c',
   meson_version: '>= 1.3.0',
   version: run_command(find_program('version.py'), check: true).stdout().strip(),
   default_options: ['c_std=gnu11,c11',
@@ -483,6 +483,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
 endif
 
 if host_machine.system() == 'windows'
+  add_languages('cpp')
+
   add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
 
   win32_extra_deps = [