21337 Commits

Author SHA1 Message Date
Kulla Christoph
048d1adb4e add_custom_command: Add DEPFILE option for Ninja
Provide a way for custom commands to inform the ninja build tool about
their implicit dependencies.  For now simply make use of the option an
error on other generators.

Closes: #15479
2016-08-30 09:05:18 -04:00
Kitware Robot
57d121fbb1 CMake Nightly Date Stamp 2016-08-30 00:01:05 -04:00
Kitware Robot
b38aa00033 CMake Nightly Date Stamp 2016-08-29 00:01:04 -04:00
Kitware Robot
4ce52abc03 CMake Nightly Date Stamp 2016-08-28 00:01:07 -04:00
Stephen Kelly
4332131dcc Convert: Make variables a bit more clear 2016-08-27 15:41:18 +02:00
Stephen Kelly
5aca066c5b Convert: Remove UNCHANGED enum value
It is no longer used.
2016-08-27 15:41:17 +02:00
Stephen Kelly
146bf9267c Convert: Remove 'FULL' conversion
It is no longer used.
2016-08-27 15:41:17 +02:00
Stephen Kelly
58ba87f892 Convert: Replace Convert(FULL) with equivalent
This is more explicit than funnelling everything through the Convert
method.
2016-08-27 15:41:17 +02:00
Stephen Kelly
e80314d7a8 Ninja: Replace ternary with if()
On principle of segregating the interface.
2016-08-27 15:26:38 +02:00
Stephen Kelly
563ac22a16 Convert: Replace trivial conversion with new method 2016-08-27 15:26:37 +02:00
Stephen Kelly
08be47cf93 Convert: Replace UNCHANGED conversions with new API call 2016-08-27 15:26:37 +02:00
Stephen Kelly
564d3a1dc8 Convert: Extract ConvertToRelativePath from Convert()
Convert() does some kind of relative conversion, followed by a
conversion to 'output format'.

Make it possible to do the former without the latter.
2016-08-27 15:26:37 +02:00
Stephen Kelly
95a659f180 Convert: Replace FULL conversions with equivalent 2016-08-27 15:26:37 +02:00
Stephen Kelly
a8c7ccb183 VS: Replace FULL/UNCHANGED conversion with equivalent 2016-08-27 15:26:37 +02:00
Stephen Kelly
5ad25ef4b6 Convert: Remove NONE conversion
It is no longer used.
2016-08-27 15:26:37 +02:00
Stephen Kelly
ac46384171 Convert: Replace uses of Convert(NONE)
These are equivalent to ConvertToOutputFormat.
2016-08-27 15:26:36 +02:00
Stephen Kelly
998d9ee967 VS: Replace variable with an if() 2016-08-27 15:21:24 +02:00
Stephen Kelly
ee49f006cf Makefiles: Replace ternaries with if()s 2016-08-27 15:21:24 +02:00
Stephen Kelly
51f7dcb0a5 Makefiles: Inline MakeLauncher into only caller 2016-08-27 15:21:24 +02:00
Stephen Kelly
ba4ba7c39d Makefiles: Simplify MakeLauncher return value
Bonus NRVO.
2016-08-27 15:21:24 +02:00
Stephen Kelly
e804d410cd Makefiles: Invert logic in MakeLauncher
Make it easier to inline into the caller.
2016-08-27 15:21:23 +02:00
Stephen Kelly
2722c4dcc5 Makefiles: Remove useless use of Convert
Convert with NONE and UNCHANGED is a no-op.
2016-08-27 15:21:14 +02:00
Stephen Kelly
112c87b28a Makefiles: Replace method with Wacom specific API
The existing method uses RelativeRoot NONE and FULL values.  In
principle, those should be segregated interfaces.  Mixing
NONE and FULL into the RelativeRoot enum is a case of

 http://thedailywtf.com/articles/What_Is_Truth_0x3f_
2016-08-27 15:16:50 +02:00
Stephen Kelly
cd351ef2c4 Makefiles: Deduplicate variable 2016-08-27 13:44:53 +02:00
Stephen Kelly
fbd8394867 Convert: Remove obsolete GetRelativeRootPath 2016-08-27 13:44:53 +02:00
Stephen Kelly
c341f4679a Makefiles: Change AppendCustomCommand API to strings
Avoid the RelativeRoot enum.  Supply the HOME_OUTPUT string at each
callsite to make the parameter non-defaulted.
2016-08-27 13:44:53 +02:00
Stephen Kelly
6960516b6b Makefiles: Change signature of AppendCustomCommand
The RelativeRoot parameter will become non-default.
2016-08-27 13:44:52 +02:00
Stephen Kelly
e0fd2d0446 Makefiles: Port CreateCDCommand to string-based API 2016-08-27 13:44:52 +02:00
Stephen Kelly
ad70a236f4 Convert: Remove ConvertToOutputForExisting overload
It is no longer used.
2016-08-27 13:44:52 +02:00
Stephen Kelly
e3ca17e13b Makefiles: Use string overload of ConvertToOutputForExisting
The string is already determined so, no need to call the overload to
determine it again.
2016-08-27 13:44:52 +02:00
Stephen Kelly
0bbdbd95c9 Makefiles: Rename local variable
In this context, 'ret' means 'return', but I don't really know what that
means.  It is not consistent with types and other variables used in the
vicinity for these things.
2016-08-27 13:44:52 +02:00
Stephen Kelly
9440d5776b Convert: Remove unused overload 2016-08-27 13:44:51 +02:00
Kitware Robot
897346032b CMake Nightly Date Stamp 2016-08-27 00:01:05 -04:00
Brad King
c8c58947f2 Merge branch 'vs-NsightTegra-empty-version' into release 2016-08-26 10:03:37 -04:00
Fujii Hironori
1f4aeb1739 VS: Fix out-of-bounds write on empty Nsight Tegra version
In cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator,
wrote 0 to this->NsightTegraVersion[-1] if sscanf returns -1 which is
the case of GetNsightTegraVersion is empty.
2016-08-26 10:01:39 -04:00
Kevin Ottens
38995d19b8 CodeBlocks: List C++ includes first
When using the Clang Code Model in QtCreator, it turned out that having
the C system include dirs can make it report false positives for most
uses of the STL. This is due to the order the Clang Code Model looks at
the include directories and some C includes in /usr/include could be
incompatible with the used STL if found first.
2016-08-26 09:55:30 -04:00
Brad King
da7111e1a3 Merge topic 'vs-resource-pri-dir'
f325ae18 VS: Use target-specific directory for `resources.pri`
2016-08-26 09:45:28 -04:00
Kitware Robot
ff88df48e8 CMake Nightly Date Stamp 2016-08-26 00:01:04 -04:00
Brad King
98caa14cc8 Merge topic 'include-what-you-use'
38491644 CTest: fix include-what-you-use violations
2016-08-25 09:50:45 -04:00
Brad King
a79abb82fe Merge topic 'extract-cmMessenger'
1462576b Parser: Port away from cmMakefile
421012a3 cmMessenger: Extract from cmake class
14a8d61f cmMakefile: Port nested error logic away from cmExecutionStatus
2af853de cmMakefile: Simplify IssueMessage implementation
33bb9cfa Parser: Issue messages through cmake, not cmSystemTools
db7de303 Parser: Store the Backtrace for use in issuing messages
2016-08-25 09:50:39 -04:00
Brad King
ce8fadc717 Merge topic 'intel-fortran-mod-diff'
f699323a Fortran: Fix .mod file comparison for Intel 16 format
2016-08-25 09:50:35 -04:00
Brad King
d8b70f62cb Merge topic 'update-kwsys'
7bc6dccc Merge branch 'upstream-KWSys' into update-kwsys
fcc53247 KWSys 2016-08-24 (8e643b9b)
2016-08-25 09:50:19 -04:00
Stephen Kelly
1462576bcb Parser: Port away from cmMakefile
It is an unneeded dependency.
2016-08-25 09:47:27 -04:00
Stephen Kelly
421012a330 cmMessenger: Extract from cmake class
This way messages can be issued independent of the cmake instance.

It is now possible to make DisplayMessage a virtual interface and
override it to handle messages in the cmake-gui or future IDE
interaction interfaces.
2016-08-25 09:47:27 -04:00
Stephen Kelly
14a8d61fd4 cmMakefile: Port nested error logic away from cmExecutionStatus
It is no longer needed.
2016-08-25 09:47:26 -04:00
Stephen Kelly
2af853deb5 cmMakefile: Simplify IssueMessage implementation
It is only called during configure time when the execution stack is
non-empty.
2016-08-25 09:47:26 -04:00
Stephen Kelly
33bb9cfa36 Parser: Issue messages through cmake, not cmSystemTools
Make these messages uniform with regard to other messages issued by
cmake.
2016-08-25 09:47:26 -04:00
Daniel Pfeifer
3849164454 CTest: fix include-what-you-use violations 2016-08-25 09:34:37 -04:00
Brad King
f325ae186d VS: Use target-specific directory for resources.pri
Set the `ProjectPriFullPath` field to a value that is unique to each
target and not shared with others in order to avoid collisions.

Closes: #16106
2016-08-25 09:17:17 -04:00
Kitware Robot
d6734eeb87 CMake Nightly Date Stamp 2016-08-25 00:01:04 -04:00