- Fixed CMakeLists issues reported by hbelusca