Iron out some differences between configure and CMake build (fixes ROOT-6353)