summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorAllen Winter <allen.winter@kdab.com>2020-03-02 15:40:43 -0500
committerAllen Winter <allen.winter@kdab.com>2020-03-02 15:40:43 -0500
commit349d16e9df56e5ac962c05302691bc5a2c61eb86 (patch)
tree19e5a2f6bb15e31cdf2fe7c5ccca62c30d0a56fa /scripts
parent4f8a21305f65ef8145775b5ad1428b3a72fc71de (diff)
downloadlibical-git-349d16e9df56e5ac962c05302691bc5a2c61eb86.tar.gz
CMakeLists.txt - enable_language(cxx) higher in the file
we were referencing CXX_variables without enabling cxx also add a test for when C++ bindings are disabled
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/buildtests.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/buildtests.sh b/scripts/buildtests.sh
index 9b2dfd24..3431e7df 100755
--- a/scripts/buildtests.sh
+++ b/scripts/buildtests.sh
@@ -109,7 +109,7 @@ CPPCHECK_WARNINGS() {
# print warnings find in the clang-tidy output
# $1 = file with the clang-tidy output
TIDY_WARNINGS() {
- whitelist='\(Value[[:space:]]descriptions\|unused[[:space:]]declarations\|g-ir-scanner:\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|modernize-\|cppcoreguidelines-pro-type-const-cast\|cppcoreguidelines-pro-type-reinterpret-cast\|cppcoreguidelines-owning-memory\|fuchsia.*\|hicpp-use-auto\|hicpp-no-malloc\|hicpp-use-nullptr\|hicpp-exception-baseclass\|hicpp-vararg\|cppcoreguidelines-pro-type-vararg\|cppcoreguidelines-pro-bounds-pointer-arithmetic\|google-build-using-namespace\|llvm-include-order\|hicpp-use-equals-default\|cppcoreguidelines-no-malloc\|g_type_class_add_private.*is[[:space:]]deprecated\)'
+ whitelist='\(Value[[:space:]]descriptions\|unused[[:space:]]declarations\|g-ir-scanner:\|clang.*argument[[:space:]]unused[[:space:]]during[[:space:]]compilation\|modernize-\|cppcoreguidelines-pro-type-const-cast\|cppcoreguidelines-pro-type-vararg\|cppcoreguidelines-pro-type-reinterpret-cast\|cppcoreguidelines-owning-memory\|fuchsia.*\|hicpp-use-auto\|hicpp-no-malloc\|hicpp-use-nullptr\|hicpp-exception-baseclass\|hicpp-vararg\|cppcoreguidelines-pro-type-vararg\|cppcoreguidelines-pro-bounds-pointer-arithmetic\|google-build-using-namespace\|llvm-include-order\|hicpp-use-equals-default\|cppcoreguidelines-no-malloc\|g_type_class_add_private.*is[[:space:]]deprecated\)'
CHECK_WARNINGS $1 "warning:" "$whitelist"
}
@@ -500,6 +500,7 @@ GCC_BUILD testgcc2 "$CMAKEOPTS"
GCC_BUILD testgcc3 "$UUCCMAKEOPTS"
GCC_BUILD testgcc4lto "$LTOCMAKEOPTS"
GCC_BUILD testgcc4glib "$GLIBOPTS"
+GCC_BUILD testgccnocxx "$CMAKEOPTS -DWITH_CXX_BINDINGS=off"
if (test "`uname -s`" = "Linux")
then
echo "Temporarily disable cross-compile tests"