Skip to content

Include cmConfigure.h via angle-brackets to aid bootstrap

Brad King requested to merge brad.king/cmake:include-style-cmConfigure into master

Since !691 (merged) we include cmConfigure.h via "" instead of <>. Unfortunately this breaks the bootstrap script when run more than once in an in-source build. In that case cmConfigure.h is generated next to the source files that include it, so ""-style includes prevent the Bootstrap.cmk/cmConfigure.h file from being included during bootstrap.

Fix this by converting back to #include <cmConfigure.h>:

git grep -l 'include "cmConfigure\.h"' |
  xargs sed -i 's/"cmConfigure.h"/<cmConfigure.h>/'

Add blank lines in a few files to tell clang-format not to move these include lines.

Fixes: #17082 (closed)

Edited by Brad King

Merge request reports