improve CMakeLists files