Update to 1.5.4

While here, instead of patching cflags.cmake, rely on the ENABLE_CXX_WERROR
CMake option.

With hat: puppet