Move couple CMake macros to more logical place (reflects http://git.io/uX17cw).
Warning fix.