[CMake] Use empty endif() and else() statements in generated scripts.

We follow the advice of upstream and use only empty endif() and
else() statements in new code. The removal of the optional argument
is only in generated scripts.