Some changes to CMakeLists.txt to make compatible with CMake 2.6.0