Modified CMAKE so that it is more generic and includes everything correctly...

Modified CMAKE so that it is more generic and includes everything correctly for the .so wrapper. A Valid Makefile is also provided in cpp directory in case (very likely) that cmake would not do what it is supposed to