mirror of https://github.com/neutrinolabs/xrdp
Update scripts/install_cppcheck.sh for v2.15.0
Remove the setting of CPPFLAGS for cppcheck v2.15.0 as this upsets the setting of FILESDIR
This commit is contained in:
parent
8f21f43768
commit
bc3f0e63f6
|
@ -130,12 +130,7 @@ fi
|
||||||
# CFGDIR is needed for cppcheck before 1.86
|
# CFGDIR is needed for cppcheck before 1.86
|
||||||
make_args="$make_args CFGDIR=$FILESDIR"
|
make_args="$make_args CFGDIR=$FILESDIR"
|
||||||
;;
|
;;
|
||||||
2.8 | 2.9 | 2.1*)
|
2.0 | 2.1 | 2.2 | 2.3 | 2.4 | 2.4.1 | 2.5 | 2.6 | 2.7)
|
||||||
# Cppcheck 2.8 removed the dependency on z3
|
|
||||||
# Cppcheck 2.8 added optional support for utilizing Boost
|
|
||||||
make_args="$make_args CPPFLAGS=-DHAVE_BOOST"
|
|
||||||
;;
|
|
||||||
2.*)
|
|
||||||
make_args="$make_args USE_Z3=yes"
|
make_args="$make_args USE_Z3=yes"
|
||||||
# Check that the Z3 development files appear to be installed
|
# Check that the Z3 development files appear to be installed
|
||||||
# before trying to create z3_version.h. Otherwise we may
|
# before trying to create z3_version.h. Otherwise we may
|
||||||
|
@ -147,6 +142,14 @@ fi
|
||||||
create_z3_version_h
|
create_z3_version_h
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
|
2.8 | 2.9 | 2.10 | 2.11* | 2.12.* | 2.13.* | 2.14.* )
|
||||||
|
# Cppcheck 2.8 removed the dependency on z3
|
||||||
|
# Cppcheck 2.8 added optional support for utilizing Boost
|
||||||
|
make_args="$make_args CPPFLAGS=-DHAVE_BOOST"
|
||||||
|
;;
|
||||||
|
2.*)
|
||||||
|
# Cppcheck 2.15 doesn't seem to define FILESDIR if CPPFLAGS is set
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
# Use all available CPUs
|
# Use all available CPUs
|
||||||
|
|
Loading…
Reference in New Issue