Removing commented-out code in CMakeLists.txt
More trickery for static compilation

But it now works