small modifications to CMake