Merge pull request #387 from joerg-krause/cmake-option-strict-iso upstream-git upstream/1.6.5
authorChristopher Dunn <cdunn2001@gmail.com>
Fri, 30 Oct 2015 06:16:49 +0000 (01:16 -0500)
committerChristopher Dunn <cdunn2001@gmail.com>
Fri, 30 Oct 2015 06:16:49 +0000 (01:16 -0500)
Disable -pedantic conditionally; add -pedantic-errors and -Werror conditionally


Trivial merge