CMake cleanups

-------
Also works on Fedora Rawhide (22) with GCC 4.9.2 with CMake master except for a build failure in binutils (investigating).