build: tweak & update

disable toys & guile for now. Add some extra warnings.
pull/2234/merge
Dirk-Jan C. Binnema 9 months ago
parent 4fc05261ce
commit d873c231ee
  1. 9
      Makefile.meson
  2. 2
      configure.ac
  3. 9
      meson.build

@ -46,13 +46,14 @@ test-verbose-if-fail: all
@cd $(BUILDDIR); $(MESON) test || $(MESON) test --verbose
test-valgrind: $(BUILDDIR)
@cd $(BUILDDIR); $(MESON) test \
--wrap='valgrind --leak-check=full --error-exitcode=1' \
@cd $(BUILDDIR); $(MESON) test \
--wrap='valgrind --leak-check=full --error-exitcode=1' \
--timeout-multiplier 100
test-helgrind: $(BUILDDIR)
@cd $(BUILDDIR); $(MESON) test --wrap='valgrind --tool=helgrind --error-exitcode=1'
@cd $(BUILDDIR); $(MESON) test \
--wrap='valgrind --tool=helgrind --error-exitcode=1' \
--timeout-multiplier 100
dist: $(BUILDDIR)
@cd $(BUILDDIR); $(MESON) dist

@ -47,7 +47,7 @@ extra_flags="-Wformat-security \
-Wstack-protector-all \
-Wno-cast-function-type \
-Wno-bad-function-cast \
-Wno-switch-enum"
-Wno-switch-enum"
AX_CXX_COMPILE_STDCXX_17
AX_COMPILER_FLAGS_CXXFLAGS([],[],[${extra_cflags}])

@ -23,7 +23,7 @@ project('mu', ['c', 'cpp'],
license: 'GPL-3.0-or-later',
default_options : [
'buildtype=debugoptimized',
'warning_level=2',
'warning_level=3',
'c_std=c11',
'cpp_std=c++17'
]
@ -40,6 +40,7 @@ infodir = join_paths(prefixdir, get_option('infodir'))
# compilers / flags
#
extra_flags = [
'-Wextra',
'-Wno-unused-parameter',
'-Wno-cast-function-type',
'-Wno-#warnings'
@ -180,14 +181,16 @@ endif
if not get_option('guile').disabled() and guile_dep.found()
config_h_data.set('BUILD_GUILE', 1)
config_h_data.set_quoted('GUILE_BINARY', 'guile')
#3subdir('guile')
message('guile is disabled for now')
#subdir('guile')
endif
config_h_data.set_quoted('MU_PROGRAM', mu.full_path())
if get_option('toys').enabled()
subdir('toys/mug')
message('toys are disabled for now')
#subdir('toys/mug')
endif
################################################################################

Loading…
Cancel
Save