Inverted if statement
CMake flags to make library selection explicit
Merge branch 'emery'