Issue #3 - Simplify CMakeLists.txt