diff --git a/lang/c++/meson.build b/lang/c++/meson.build
index da3cb72067a..6efd2effbac 100644
--- a/lang/c++/meson.build
+++ b/lang/c++/meson.build
@@ -1,7 +1,7 @@
 project('avro-cpp', 'cpp', version: '1.0', 
   default_options: [
     'cpp_std=c++17',
-    'warning_level=everything',
+    'warning_level=3',
     'werror=true'
   ])
 
@@ -66,22 +66,16 @@ avro_sources = [
 ]
 
 # Create shared and static libraries
-libavro_shared = shared_library('avrocpp', avro_sources, 
+libavro = library('avrocpp', avro_sources, 
   include_directories: include_directories('include/avro'),
   dependencies: [boost_dep, snappy_dep, fmt_dep],
   version: '@0@.@1@.@2@'.format(avro_version_major, avro_version_minor, avro_version_patch.split('-')[0]),
   install: true
 )
 
-libavro_static = static_library('avrocpp_s', avro_sources,
-  include_directories: include_directories('include/avro'),
-  dependencies: [boost_dep, snappy_dep, fmt_dep],
-  install: true
-)
-
 # AvroGenCpp executable
 avrogencpp_exe = executable('avrogencpp', 'impl/avrogencpp.cc',
-  link_with: libavro_static,
+  link_with: libavro,
   include_directories: include_directories('include/avro'),
   dependencies: [boost_dep, snappy_dep, fmt_dep],
   install: true
@@ -89,7 +83,7 @@ avrogencpp_exe = executable('avrogencpp', 'impl/avrogencpp.cc',
 
 # Precompile test executable
 precompile_exe = executable('precompile', 'test/precompile.cc',
-  link_with: libavro_static,
+  link_with: libavro,
   include_directories: include_directories('include/avro'),
   dependencies: [boost_dep, snappy_dep, fmt_dep]
 )
@@ -139,7 +133,7 @@ foreach test_name : test_list
   test_exe = executable(test_name, 
     sources: schema_headers + ['test/@0@.cc'.format(test_name)],
     include_directories: include_directories('include/avro'),
-    link_with: libavro_shared,
+    link_with: libavro,
     dependencies: [boost_dep, snappy_dep,fmt_dep]
   )
   test(test_name, test_exe)