Brad King
6c32d43ce2
Merge branch 'upstream-kwsys' into update-kwsys
2014-08-11 09:31:29 -04:00
Brad King
51c82c3a66
Merge branch 'upstream-kwsys' into update-kwsys
2014-08-11 09:30:22 -04:00
Kitware Robot
3b0d634f70
CMake Nightly Date Stamp
2014-08-11 00:01:07 -04:00
Kitware Robot
58aca7be56
CMake Nightly Date Stamp
2014-08-10 00:01:08 -04:00
Kitware Robot
35a8355b61
CMake Nightly Date Stamp
2014-08-09 00:01:12 -04:00
Kitware Robot
a99b42a410
CMake Nightly Date Stamp
2014-08-08 00:01:12 -04:00
Brad King
6f0d1a38c8
Merge topic 'genex-build-property-no-head'
...
3f476bea
Genex: Do not consider 'head' when evaluating build properties
2014-08-07 10:07:51 -04:00
Brad King
df08d8575b
Merge topic 'genex-context-makefile-non-null'
...
c6acbc90
Genex: Remove unnecessary check of context->Makefile
2014-08-07 10:07:49 -04:00
Kitware Robot
029edcdf3e
CMake Nightly Date Stamp
2014-08-07 00:01:10 -04:00
Brad King
3f476beaf7
Genex: Do not consider 'head' when evaluating build properties
...
When $<TARGET_PROPERTY> names a build property like COMPILE_DEFINITIONS
but not the usage requirement (INTERFACE_) version of it, the value
should be that used to build the target. It should not be influenced by
a dependent 'head' target like usage requirements are.
Extend the CompileDefinitions test with a case covering the corrected
behavior.
Reviewed-by: Stephen Kelly <steveire@gmail.com>
2014-08-06 10:13:04 -04:00
Brad King
e56db93a7b
Merge topic 'fix_value_not_used'
...
2cac483e
Fix used value warning.
2014-08-06 09:26:34 -04:00
Brad King
78efe8d4fd
Merge topic 'file-strings-encoding'
...
5b30ec28
file: Add ENCODING option to file(STRINGS) command (#10519 )
ffa373e7
file: Refactor internal implementation of file(STRINGS)
2014-08-06 09:26:28 -04:00
Clinton Stimpson
5b30ec28f9
file: Add ENCODING option to file(STRINGS) command ( #10519 )
...
Support extraction of UTF-8 strings.
2014-08-06 09:23:47 -04:00
Clinton Stimpson
ffa373e711
file: Refactor internal implementation of file(STRINGS)
...
Make room for encoding support.
2014-08-06 09:23:15 -04:00
Brad King
c6acbc9063
Genex: Remove unnecessary check of context->Makefile
...
The context->Makefile is never NULL, but our checks for it convince
Clang scan-build that it might be NULL. Then it warns about later
unchecked uses. Drop the unnecessary checks.
2014-08-06 09:11:41 -04:00
Kitware Robot
4ec6ff8f9f
CMake Nightly Date Stamp
2014-08-06 00:01:14 -04:00
Brad King
662daff0b2
Merge topic 'vs-default-ignore-libs'
...
c1580a92
VS: Always add IgnoreSpecificDefaultLibraries to .vcxproj files
29410df2
cmIDEOptions: Add an AppendFlag method to update multi-valued options
2014-08-05 10:53:27 -04:00
Bill Hoffman
2cac483e64
Fix used value warning.
...
packageFileName no longer has only one value in this function. Move the
declaration into the loop and remove its initial and unused asignment.
2014-08-05 10:22:36 -04:00
Brad King
6548e171e3
Merge topic 'fix_truncation_logic_valgrind_output'
...
b35a7730
Fix truncation of valgrind output logic.
2014-08-05 09:22:35 -04:00
Brad King
99f6eab851
Merge topic 'fix_value_not_used'
...
aea40fcb
Fix scan-build warning parsed is never read after being set.
2014-08-05 09:22:33 -04:00
Brad King
8fef9dd271
Merge topic 'pass_output_by_reference'
...
7762fffa
Change output to be a reference and not a pointer.
2014-08-05 09:22:31 -04:00
Brad King
e76b72fa83
Merge topic 'update-kwsys'
...
60c78367
Merge branch 'upstream-kwsys' into update-kwsys
158c6d1c
KWSys 2014-08-04 (e787837a)
2014-08-05 09:22:30 -04:00
Kitware Robot
a6c1d58a09
CMake Nightly Date Stamp
2014-08-05 00:01:08 -04:00
Bill Hoffman
aea40fcb43
Fix scan-build warning parsed is never read after being set.
2014-08-04 15:38:56 -04:00
Bill Hoffman
b35a7730ce
Fix truncation of valgrind output logic.
...
This showed up because scan-build noticed outputFull was basically
a constant. Logic should be output all valgrind output. Then output
regular test output until output limit is reached.
2014-08-04 15:28:48 -04:00
Bill Hoffman
7762fffa23
Change output to be a reference and not a pointer.
...
This avoids having to check the pointer value at each use which
was not being done.
2014-08-04 15:16:40 -04:00
Brad King
60c783676c
Merge branch 'upstream-kwsys' into update-kwsys
2014-08-04 10:16:34 -04:00
Brad King
ba60ff99ed
Merge topic 'cmGlobalGenerator-Build-output-ref'
...
30983ebe
cmGlobalGenerator: Take Build output argument by reference
2014-08-04 10:02:28 -04:00
Brad King
ba62b3495b
Merge topic 'vs-internal-system-apis'
...
0a5fe279
VS: Add internal API to get system name and version
2014-08-04 10:02:27 -04:00
Brad King
7338d4c211
Merge topic 'vs-refactor-sln-deploy'
...
fe161dc3
VS: Refactor logic deciding to add "Deploy" to the .sln file
2014-08-04 10:02:25 -04:00
Brad King
4e22fcf215
Merge topic 'vs-vcxproj-missing-newline'
...
66edd065
VS: Add missing newline after .vcxproj user prop import line
2014-08-04 10:02:23 -04:00
Brad King
628f02ba35
Merge topic 'link-line-dedup'
...
ccec6df8
Help: Add notes for topic 'link-line-dedup'
9f7e27fc
De-duplicate shared library targets in generated link lines
2014-08-04 10:02:16 -04:00
Kitware Robot
1238b3656a
CMake Nightly Date Stamp
2014-08-04 00:01:06 -04:00
Kitware Robot
6e1c35f25c
CMake Nightly Date Stamp
2014-08-03 00:01:13 -04:00
Kitware Robot
ed4b52b025
CMake Nightly Date Stamp
2014-08-02 00:01:09 -04:00
Kitware Robot
b0f6d3eb99
CMake Nightly Date Stamp
2014-08-01 00:01:08 -04:00
Brad King
c1580a9217
VS: Always add IgnoreSpecificDefaultLibraries to .vcxproj files
...
Append %(IgnoreSpecificDefaultLibraries) to any user-specified
libraries so that the system-default list of libraries to ignore
is honored even when the user specifies more.
2014-07-31 14:08:41 -04:00
Brad King
29410df23d
cmIDEOptions: Add an AppendFlag method to update multi-valued options
2014-07-31 14:08:39 -04:00
Brad King
30983ebec1
cmGlobalGenerator: Take Build output argument by reference
...
No call sites pass NULL to the output argument, so take it by
reference to avoid the if(output) conditions. Propagate the
change through the TryCompile APIs that call it.
2014-07-31 12:49:51 -04:00
Brad King
0a5fe2793a
VS: Add internal API to get system name and version
...
Add cmGlobalVisualStudio10Generator::GetSystemName and GetSystemVersion
methods to access the corresponding members publicly.
2014-07-31 10:47:22 -04:00
Gilles Khouzam
fe161dc30d
VS: Refactor logic deciding to add "Deploy" to the .sln file
...
Move the condition to a "NeedsDeploy" virtual method that can be
overridden by more recent VS generators.
2014-07-31 10:46:00 -04:00
Gilles Khouzam
66edd06587
VS: Add missing newline after .vcxproj user prop import line
2014-07-31 10:39:21 -04:00
Brad King
bd642272b9
Merge topic 'fix-CMP0049-extra-error'
...
b2282631
cmTarget: Do not mistake a preceding error for a CMP0049 failure
2014-07-31 09:17:41 -04:00
Brad King
c1560296db
Merge topic 'update_jacoco_search_paths'
...
9fd04f87
CTEST: Update Jacoco Coverage search paths
2014-07-31 09:17:39 -04:00
Brad King
2ba18f6284
Merge topic 'cpack-ifw-generator'
...
e7511b7f
CPackIFW: Add package configuration variables
b2340001
CPackIFW: Document cpack_ifw_configure_component DEPENDS option
2014-07-31 09:17:37 -04:00
Brad King
9f575a26fd
Merge topic 'pdb-genex'
...
f86850ef
Genex: Implement generator expressions for target PDB files.
028ad318
Genex: Simplify filesytem artifact code
2014-07-31 09:17:35 -04:00
Nils Gladitz
f86850ef60
Genex: Implement generator expressions for target PDB files.
2014-07-31 09:17:53 -04:00
Kitware Robot
202b7d12eb
CMake Nightly Date Stamp
2014-07-31 00:01:24 -04:00
Brad King
b2282631f6
cmTarget: Do not mistake a preceding error for a CMP0049 failure
...
After calls to ProcessSourceItemCMP0049, check for an empty return
string to detect a failure instead of trusting GetErrorOccuredFlag.
The latter could have been left from a preceding non-fatal error.
Extend the RunCMake.Configure test to cover a case that exposed this
problem.
2014-07-30 13:48:33 -04:00
Joseph Snyder
9fd04f874c
CTEST: Update Jacoco Coverage search paths
...
Add a new additional entry to the FilePaths array when a
"package" tag has been found. This path should consist of the package
information found appended to the projects source directory.
This change will allow code held in a /src/main/java/* directory off of the
projects source directory to be found, unlike now which assumes a subdirectory
contains the code.
2014-07-30 11:22:55 -04:00