Configuration defs are commented out...

... and should be set by the build system
Updated the CMake build system
A few micro optimizations