Make Travis file use CXXFLAGS/CMAKE_CXX_FLAGS

This commit is contained in:
Clownacy 2020-03-14 22:53:08 +00:00
parent 7d4fda54ef
commit 7420594241

View file

@ -126,7 +126,7 @@ before_script:
if [ "$BUILD_SYSTEM" == "cmake" ]; then
# Make build directory and generate CMake build files
mkdir -p ${CMAKE_BUILD_DIR} && cd ${CMAKE_BUILD_DIR}
cmake .. -DCMAKE_BUILD_TYPE=Release -DFIX_BUGS=ON -DWARNINGS=ON -DWARNINGS_ALL=ON -DRENDERER=$RENDERER
cmake .. -DCMAKE_BUILD_TYPE=Release -DFIX_BUGS=ON -DRENDERER=$RENDERER -DCMAKE_CXX_FLAGS="-Wall -Wextra -pedantic"
cd ..
fi
@ -139,7 +139,7 @@ script:
cd ..
else
# Make build
make -j $JOBS FIX_BUGS=1 RELEASE=1 WARNINGS=1 WARNINGS_ALL=1 RENDERER=$RENDERER
make -j $JOBS FIX_BUGS=1 RELEASE=1 RENDERER=$RENDERER CXXFLAGS="-Wall -Wextra -pedantic"
fi
after_success: