cleaned up and adjusted CMakeLists.txt

- builds now fine on Windows7 with Visual Studio 2013