From Peter Kümmel: fixes for standalone cling / CMake.