CMakeLists warning corrections

Benoît LÉ requested to merge correctCMakeLists into master

Corrected some bugs (essentially in IF/ENDIF) which may cause some warnings when running cmake.

Merge request reports