Improvements on CMakeLists.txt files