COMP: fix some CMake 3 problems