Update CMakeLists.txt from nupic branch