CMakeLists.txt enhancement