Merge pull request #169 from OpenBrickProtocolFoundation/additional-wrapper-changes

build system: keep flag "-stdlib=libc++" private in pkg-config files

Author: Totto16

.github/workflows/build.yml

@@ -41,7 +41,6 @@ jobs:
             library_type: static
             shell: "msys2 {0}"
 
-
           - name: Linux Release
             os: ubuntu
             os-version: 24.04

src/libs/core/meson.build

@@ -21,11 +21,18 @@ liboopetris_core = library(
     version: meson.project_version(),
     install: true,
 )
+## remove '-stdlib=libc++' from the list, if it's present
+core_dep_compile_args = []
+foreach value : core_lib.get('compile_args')
+    if value != '-stdlib=libc++'
+        core_dep_compile_args += value
+    endif
+endforeach
 
 liboopetris_core_dep = declare_dependency(
     link_with: liboopetris_core,
     include_directories: core_lib.get('inc_dirs'),
-    compile_args: core_lib.get('compile_args'),
+    compile_args: core_dep_compile_args,
     dependencies: core_lib.get('deps'),
     version: meson.project_version(),
 )
@@ -37,14 +44,6 @@ install_headers(
     preserve_path: true,
 )
 
-## remove '-stdlib=libc++' from the list, if it's present
-core_dep_compile_args = []
-foreach value : core_lib.get('compile_args')
-    if value != '-stdlib=libc++'
-        core_dep_compile_args += value
-    endif
-endforeach
-
 # generate pkgconfig files
 pkg = import('pkgconfig')
 

src/libs/recordings/meson.build

@@ -25,10 +25,19 @@ liboopetris_recordings = library(
     install: true,
 )
 
+## remove '-stdlib=libc++' from the list, if it's present
+recordings_dep_compile_args = []
+foreach value : recordings_lib.get('compile_args')
+    if value != '-stdlib=libc++'
+        recordings_dep_compile_args += value
+    endif
+endforeach
+
+
 liboopetris_recordings_dep = declare_dependency(
     link_with: liboopetris_recordings,
     include_directories: recordings_lib.get('inc_dirs'),
-    compile_args: recordings_lib.get('compile_args'),
+    compile_args: recordings_dep_compile_args,
     dependencies: recordings_lib.get('deps'),
     version: meson.project_version(),
 )
@@ -48,7 +57,7 @@ pkg.generate(
     name: 'oopetris-recordings',
     filebase: 'oopetris-recordings',
     subdirs: 'oopetris',
-    extra_cflags: recordings_lib.get('compile_args'),
+    extra_cflags: recordings_dep_compile_args,
     variables: ['compiler=' + pkg_cpp_compiler, 'cpp_stdlib=' + pkg_cpp_stdlib],
 )