Changes to CMakeLists to make it compatible with higher level project