Brad King
e1c7747253
Format include directive blocks and ordering with clang-format
...
Sort include directives within each block (separated by a blank line) in
lexicographic order (except to prioritize `sys/types.h` first). First
run `clang-format` with the config file:
---
SortIncludes: false
...
Commit the result temporarily. Then run `clang-format` again with:
---
SortIncludes: true
IncludeCategories:
- Regex: 'sys/types.h'
Priority: -1
...
Commit the result temporarily. Start a new branch and cherry-pick the
second commit. Manually resolve conflicts to preserve indentation of
re-ordered includes. This cleans up the include ordering without
changing any other style.
Use the following command to run `clang-format`:
$ git ls-files -z -- \
'*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
egrep -z -v '(Lexer|Parser|ParserHelper)\.' |
egrep -z -v '^Source/cm_sha2' |
egrep -z -v '^Source/(kwsys|CursesDialog/form)/' |
egrep -z -v '^Utilities/(KW|cm).*/' |
egrep -z -v '^Tests/Module/GenerateExportHeader' |
egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |
xargs -0 clang-format -i
This selects source files that do not come from a third-party.
Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
2016-04-29 13:58:54 -04:00
Brad King
180538c706
Source: Stabilize include order
...
Each source file has a logical first include file. Include it in an
isolated block so that tools that sort includes do not move them.
2016-04-29 13:58:31 -04:00
Brad King
b42866a34a
Drop Visual Studio 6 generator
...
This generator has been deprecated since CMake 3.3. Remove it.
Update documentation, modules, and tests to drop content specific
to this generator.
2016-03-09 09:42:18 -05:00
Brad King
2fd5fd1f4d
Merge topic 'minor-cleanups'
...
13a37f5f
cmMakefile: Fix typo in comment
958508bb
cmMakefile: Fix style
91a829c1
Makefiles: Remove unused variable
e0213882
cmTarget: Remove obsolete member
0554c2c9
cmTarget: Fix style
b22e5d0a
Remove some obsolete declarations
ce43ed2c
Use LocalGenerator when possible
d90c9738
Makefiles: Remove some unneeded casts
331023ae
Export: Remove unused variable
a03f3d0e
cmFunctionBlocker: Constify method
d50c4220
Xcode: Fix typo in comment
803f1901
Xcode: Remove trailing semicolon
2015-10-28 08:48:08 -04:00
Stephen Kelly
e021388222
cmTarget: Remove obsolete member
2015-10-27 21:54:11 +01:00
Stephen Kelly
b22e5d0ab7
Remove some obsolete declarations
...
Ensure that cmStandardIncludes.h is included before any platform header
in cmGeneratorExpressionEvaluator.h. That file needs to change as
a result of removal of the cmMakefile.h header from
cmGeneratorExpressionNode.h, affecting the compilation of
cmGeneratorExpressionNode.cxx.
On AIX we need to include our own headers first to get large file
support macros defined consistently within system headers. The old
order in this header worked only because it was always included after
other headers.
2015-10-27 21:52:47 +01:00
Stephen Kelly
0c97d32f7a
cmGlobalGenerator: Remove direct storage of targets
...
Find the target by looping when needed.
2015-10-27 07:44:23 +01:00
Stephen Kelly
b397eae82e
cmGeneratorTarget: Move LinkLanguagePropagatesToDependents from cmTarget
2015-10-27 07:44:21 +01:00
Stephen Kelly
f210cb131e
cmTarget: Make compatbility API explicit.
2015-10-27 07:44:20 +01:00
Stephen Kelly
cf69630e51
cmGeneratorTarget: Move GetFrameworkVersion from cmTarget
2015-10-26 22:02:13 +01:00
Stephen Kelly
c2c239e607
cmGlobalGenerator: Move GeneratorTargetsType to usage site.
2015-10-24 09:19:52 +02:00
Stephen Kelly
d74bca5a8f
cmGeneratorTarget: Copy the policy map from the cmTarget.
2015-10-21 00:52:23 +02:00
Stephen Kelly
c6e8695508
cmTarget: Remove unused NameResolvesToFramework.
2015-10-21 00:52:23 +02:00
Stephen Kelly
91411641a7
Move ComputeLinkType out of cmTarget.
...
Keep it out of the way, so that it does not become part of cmGeneratorTarget,
but where it can be used to implement CMP0003.
2015-10-21 00:52:22 +02:00
Stephen Kelly
6d94078e62
cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
2015-10-21 00:52:22 +02:00
Stephen Kelly
3ebc62850c
cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
2015-10-21 00:52:22 +02:00
Stephen Kelly
311018e5ad
cmGeneratorTarget: Move GetExportMacro from cmTarget.
2015-10-21 00:52:22 +02:00
Stephen Kelly
d8f8940bc6
cmGeneratorTarget: Move IsCFBundleOnApple from cmTarget.
2015-10-19 20:27:41 +02:00
Stephen Kelly
7550879f57
cmGeneratorTarget: Move IsXCTestOnApple from cmTarget.
2015-10-19 20:27:41 +02:00
Stephen Kelly
8e20ea6ef2
cmGeneratorTarget: Move IsLinkable from cmTarget.
2015-10-19 20:27:40 +02:00
Stephen Kelly
eb3be7d688
cmGeneratorTarget: Move GetExportName from cmTarget.
2015-10-18 16:29:30 +02:00
Stephen Kelly
beff29f0d4
cmGeneratorTarget: Move ComputeVersionedName from cmTarget.
2015-10-16 20:24:44 +02:00
Stephen Kelly
12e4790a0b
cmGeneratorTarget: Move GetTargetVersion from cmTarget.
2015-10-16 20:24:44 +02:00
Stephen Kelly
1427227720
cmGeneratorTarget: Move CheckCMP0004 from cmTarget.
2015-10-16 20:24:44 +02:00
Stephen Kelly
8f363d6771
cmGeneratorTarget: Move ImportInfo from cmTarget.
2015-10-16 20:24:43 +02:00
Stephen Kelly
a892b285f8
cmGeneratorTarget: Move ImportedGetLocation from cmTarget.
2015-10-16 20:24:43 +02:00
Stephen Kelly
cb8c728f17
cmGeneratorTarget: Move GetFullNameImported from cmTarget.
2015-10-16 20:24:43 +02:00
Stephen Kelly
60bd9f9c92
cmGeneratorTarget: Move GetObjectLibrariesCMP0026 from cmTarget.
2015-10-16 20:17:22 +02:00
Stephen Kelly
55474e6182
cmState: Move GetTargetTypeName from cmTarget.
2015-10-15 00:41:40 +02:00
Stephen Kelly
eac15298a8
cmState: Move TargetType enum from cmTarget.
...
Mostly automated:
values=( "EXECUTABLE" "STATIC_LIBRARY" "SHARED_LIBRARY" "MODULE_LIBRARY" "OBJECT_LIBRARY" "UTILITY" "GLOBAL_TARGET" "INTERFACE_LIBRARY" "UNKNOWN_LIBRARY" "TargetType")
for i in "${values[@]}"; do git grep -l cmTarget::$i | xargs sed -i "s|cmTarget::$i|cmState::$i|g"; done
2015-10-15 00:41:39 +02:00
Stephen Kelly
482b3811e4
cmTarget: Move link type enum out.
...
Remove a reason for generate time code to depend on the cmTarget header/type.
2015-10-15 00:41:22 +02:00
Stephen Kelly
2ee1cb85e8
cmTarget: Move ImportInfoMap out of internal class.
2015-10-15 00:41:22 +02:00
Stephen Kelly
a48bcabd33
cmTarget: Move backtrace member out of internal class.
2015-10-15 00:41:21 +02:00
Stephen Kelly
ce75c86ec3
cmGeneratorTarget: Move GetSupportDirectory from cmTarget.
2015-10-12 18:39:59 +02:00
Stephen Kelly
526cc7dc52
cmGeneratorTarget: Move HasImportLibrary from cmTarget.
2015-10-12 18:39:59 +02:00
Stephen Kelly
8d2e3e53b9
cmGeneratorTarget: Move HasImplibGNUtoMS from cmTarget.
2015-10-12 18:39:59 +02:00
Stephen Kelly
bf2d061ad3
cmGeneratorTarget: Move FindTargetToLink from cmTarget.
2015-10-12 18:39:58 +02:00
Stephen Kelly
9ca4cae51e
cmGeneratorTarget: Move GetUtilityItems from cmTarget.
2015-10-12 18:39:58 +02:00
Stephen Kelly
3e428fdcb4
cmGeneratorTarget: Move IsImportedSharedLibWithoutSOName from cmTarget.
2015-10-10 11:03:48 +02:00
Stephen Kelly
110fd2fba1
cmGeneratorTarget: Move GetOutputTargetType from cmTarget.
2015-10-10 11:03:48 +02:00
Stephen Kelly
e73916992c
cmGeneratorTarget: Move HasMacOSXRpathInstallNameDir from cmTarget.
2015-10-10 11:03:48 +02:00
Stephen Kelly
c5718217ad
cmGeneratorTarget: Move HaveInstallTreeRPATH from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
bf5eb4a3f3
cmGeneratorTarget: Move ComputePDBOutputDir from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
49017cddab
cmGeneratorTarget: Move IsNullImpliedByLinkLibraries from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
0bae4a416f
cmGeneratorTarget: Move output info from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
1abc20d81d
cmGeneratorTarget: Move UsesDefaultOutputDir from cmTarget.
2015-10-09 01:04:38 +02:00
Stephen Kelly
50dc9b4440
cmGeneratorTarget: Move GetPDBDirectory from cmTarget.
2015-10-09 01:04:37 +02:00
Stephen Kelly
8b0168863e
cmGeneratorTarget: Move GetDirectory from cmTarget.
2015-10-09 01:04:37 +02:00
Stephen Kelly
e0261a1e20
cmTarget: Make OutputInfo definition public.
2015-10-08 23:41:30 +02:00
Stephen Kelly
df42dbb355
cmGeneratorTarget: Move link implementation from cmTarget.
2015-10-08 23:41:29 +02:00