kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
25,106 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

16698 Commits

Author SHA1 Message Date
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
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
Brad King 9f7e27fc3a De-duplicate shared library targets in generated link lines 
The linker will bring in shared libraries as a whole and use them even
for symbols that are needed by entries later in the link line.
Therefore we do not need to repeat them.  De-duplicate link entries that
we know are shared libraries because we have a cmTarget associated with
them.

Tested-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
 2014-07-30 11:14:17 -04:00
Brad King 128a0c36ec Merge topic 'remove-link-remnants' 
250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
 2014-07-30 09:31:50 -04:00
Brad King 82a1b4fe51 Merge topic 'vs-refactor-source-tools' 
0ac28adc VS: Map .jpg and .png sources to Image tool
58bb14d4 VS: Map .xml to XML tool
972cf1d7 VS: Map .appxmanifest sources to AppxManifest tool
15fb1022 VS: Refactor handling of resx headers
c2ef6d23 VS: Refactor handling of "header" sources in VS >= 10
2df38911 VS: Refactor handling of "extra" sources in VS >= 10
143b4005 VS: Convert 'WriteSource' tool argument to std::string
 2014-07-30 09:31:49 -04:00
Brad King 2d4312a160 Merge topic 'cpack-add-lzma' 
f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)
 2014-07-30 09:31:45 -04:00
Kitware Robot b801754d1e CMake Nightly Date Stamp 2014-07-30 00:01:08 -04:00
Konstantin Podsvirov e7511b7fbe CPackIFW: Add package configuration variables 2014-07-29 15:55:19 -04:00
Nils Gladitz 250ad08a08 Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants 2014-07-29 21:33:38 +02:00
Brad King 0ac28adc01 VS: Map .jpg and .png sources to Image tool 
Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
 2014-07-29 15:06:37 -04:00
Brad King 58bb14d4ac VS: Map .xml to XML tool 
Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
 2014-07-29 15:06:35 -04:00
Brad King 972cf1d7af VS: Map .appxmanifest sources to AppxManifest tool 
Inspired-by: Minmin Gong <minmin.gong@gmail.com>
 2014-07-29 15:06:32 -04:00
Brad King 15fb102278 VS: Refactor handling of resx headers 
Move generation of the ClInclude element to WriteHeaderSource.
 2014-07-29 15:06:30 -04:00