Some CMakeLists.txt and cmake find file syntax tweaks.