reverted changes to CMakeLists.txt, use bootstrap again

now they are no longer necessary
cmake cleanup

now it fits the buildtools well I think