Skip to content
Snippets Groups Projects
Commit 1735019e authored by Georg Sauthoff's avatar Georg Sauthoff
Browse files

maintain warning flags in environment variables

instead of CMakeLists.txt
parent f84ff0d6
No related branches found
No related tags found
No related merge requests found
...@@ -14,14 +14,7 @@ configure_file(config.h.in config.h) ...@@ -14,14 +14,7 @@ configure_file(config.h.in config.h)
# guard from super-projects, i.e. when it is added as subdirectory # guard from super-projects, i.e. when it is added as subdirectory
IF(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) IF(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
# Remove existing -Wall in debug flags because we unconditionally supply
# -Wall and we don't want a trailing -Wall re-enable the silenced
# warnings
string(REPLACE "-Wall" "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++1y")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-missing-braces")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-missing-braces")
add_subdirectory(libixxx) add_subdirectory(libixxx)
add_subdirectory(libixxxutil) add_subdirectory(libixxxutil)
......
...@@ -2,6 +2,33 @@ ...@@ -2,6 +2,33 @@
set -ex set -ex
CFLAGS="-Wall -Wextra -Wno-missing-field-initializers \
-Wno-parentheses -Wno-missing-braces \
-Wmissing-prototypes -Wfloat-equal \
-Wwrite-strings -Wpointer-arith -Wcast-align \
-Wnull-dereference \
-Werror=multichar -Werror=sizeof-pointer-memaccess -Werror=return-type \
-fstrict-aliasing"
if [ "$CMAKE_BUILD_TYPE" = Release ]; then
CFLAGS="-Og $CFLAGS"
fi
export CFLAGS
CXXFLAGS="-Wall -Wextra -Wno-missing-field-initializers \
-Wno-parentheses -Wno-missing-braces \
-Wno-unused-local-typedefs \
-Wfloat-equal \
-Wpointer-arith -Wcast-align \
-Wnull-dereference \
-Wnon-virtual-dtor -Wmissing-declarations \
-Werror=multichar -Werror=sizeof-pointer-memaccess -Werror=return-type \
-Werror=delete-non-virtual-dtor \
-fstrict-aliasing"
if [ "$CMAKE_BUILD_TYPE" = Release ]; then
CXXFLAGS="-Og $CXXFLAGS"
fi
export CXXFLAGS
cd /srv/build cd /srv/build
cmake -G Ninja -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" /srv/src cmake -G Ninja -DCMAKE_BUILD_TYPE="$CMAKE_BUILD_TYPE" /srv/src
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment