Improvements to CMakeLists.txt