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

25053 Commits

Author SHA1 Message Date
Brad King b48211d426 Merge branch 'release' 2014-07-31 09:40:32 -04:00
Brad King 9e7d12466e Merge topic 'cpack-mark-ifw-advanced' 
5cabc2cd CPack: Mark CPACK_BINARY_IFW option as advanced
 2014-07-31 09:17:47 -04:00
Brad King b056b8c46c Merge topic 'cpack-add-lzma-package-options' 
9d93e099 CPack: Add lzma-compressed package options
 2014-07-31 09:17:45 -04:00
Brad King ba53bc5a9d Merge topic 'check-flag-avoid-semicolon' 
cac91206 Check*CompilerFlag: Avoid ';' in common pattern (#15048)
 2014-07-31 09:17:43 -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 5cabc2cd43 CPack: Mark CPACK_BINARY_IFW option as advanced 
All similar options are already marked.

Suggested-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2014-07-30 16:00:06 -04:00
Daniel Pfeifer 9d93e099e6 CPack: Add lzma-compressed package options 
Add options to package binary and source tarballs:

 CPACK_BINARY_7Z
 CPACK_BINARY_TXZ
 CPACK_SOURCE_7Z
 CPACK_SOURCE_TXZ
 2014-07-30 15:56:34 -04:00
Brad King 2eda7499d1 Merge branch 'check-flag-avoid-semicolon' into release 2014-07-30 15:31:45 -04:00
Brad King cac91206b3 Check*CompilerFlag: Avoid ';' in common pattern (#15048) 
In commit v3.0.0-rc1~551^2~1 (Check*CompilerFlag: make C and CXX modules
share most error patterns, 2013-08-08) a pattern containing a ';' was
moved out of a ""-quoted argument and into a variable.  CMake flattens
the containing list and breaks the pattern.  Use a '.' to match ';'.
 2014-07-30 15:21:44 -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 8d1306cd1b Merge branch 'release' 2014-07-30 09:42:38 -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 6370c90f95 Merge topic 'ExternalProject-add-lzma' 
56e6975c ExternalProject: Recognize lzma-compressed files (#13515)
98ea0344 ExternalProject: Recognize .tbz2 extension
 2014-07-30 09:31:47 -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
Konstantin Podsvirov b234000184 CPackIFW: Document cpack_ifw_configure_component DEPENDS option 2014-07-29 15:52:01 -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
Brad King c2ef6d238a VS: Refactor handling of "header" sources in VS >= 10 
Create a WriteHeaderSource method to handle writing of sources
classified by cmGeneratorTarget as header files.  This will be
useful to add special VS-specific handling for some headers.
 2014-07-29 15:06:28 -04:00
Brad King 2df389115e VS: Refactor handling of "extra" sources in VS >= 10 
Create a WriteExtraSource method to handle writing of sources not
classified by cmGeneratorTarget for any particular purpose.  This
will be useful to add special VS-specific handling for some sources.
 2014-07-29 15:06:26 -04:00
Brad King 143b40051a VS: Convert 'WriteSource' tool argument to std::string 2014-07-29 15:06:24 -04:00
Daniel Pfeifer f931a18c33 CPack: add generators for .7z and .tar.xz (#13072, #14519) 2014-07-29 09:48:41 -04:00
Brad King 56e6975ce9 ExternalProject: Recognize lzma-compressed files (#13515) 
Add .7z, .tar.xz, and .txz file extensions.

Inspired-by: Joke de Buhr <joke@seiken.de>
Inspired-by: David Cole <DLRdave@aol.com>
 2014-07-29 09:32:27 -04:00
Brad King 98ea03443b ExternalProject: Recognize .tbz2 extension 
Also fix .bz2 extension to be .tar.bz2 since we only support compressed
tarballs and not plain compressed files.

Suggested-by: Nils Gladitz <nilsgladitz@gmail.com>
Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
 2014-07-29 09:29:57 -04:00
Nils Gladitz 028ad31878 Genex: Simplify filesytem artifact code 2014-07-29 09:21:34 -04:00
Brad King 38065563b6 Merge topic 'vs10-system-hook' 
e58f9753 VS: Add a hook to adapt to SystemName and SystemVersion
d0dd28fa VS: Save system name and version in global generator members
 2014-07-29 08:52:24 -04:00
Brad King 104a4cb783 Merge topic 'vs10-comment-typo' 
99e14a38 cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLM
 2014-07-29 08:52:23 -04:00
Brad King 8cd83e0b71 Merge topic 'windows-ce-cleanup' 
7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module
05373f7e WindowsCE: Refactor setting of "WINCE"
1acde6b0 MSVC: Use STREQUAL to check for WindowsCE
 2014-07-29 08:52:21 -04:00
Brad King b5728f555d Merge topic 'fix-qthelp-windows' 
9e5e7e71 Help: Fix QtHelp commands on Windows
 2014-07-29 08:52:19 -04:00
Brad King 05d064fec3 Merge topic 'xcode-6-librarian-flags' 
608cf814 Xcode: Fix static library creation for Xcode 6 (#15038)
 2014-07-29 08:52:17 -04:00
Brad King 99a9034759 Merge topic 'doc-tll-flags' 
8c03f157 Help: Clarify target_link_libraries treatment of flags (#15034)
 2014-07-29 08:52:15 -04:00
Brad King e8698861c6 Merge topic 'osx-no-sysroot-for-deployment' 
5b4faeef OS X: Allow deployment target with "/" sysroot (#15040)
 2014-07-29 08:52:13 -04:00
Brad King 35746899a3 Merge topic 'FindQt4-more-plugins' 
4b5052b0 FindQt4: Add nativewifi and qtga plugins
 2014-07-29 08:52:11 -04:00
Brad King 4d574ee3a1 Merge topic 'add-liblzma' 
65a0ea45 Help: Add notes for topic 'add-liblzma'
8436d181 CMake: Enable use of liblzma in libarchive (#14504)
73eab246 liblzma: Avoid defining a 'restrict' macro
90e7a4d4 liblzma: Disable warnings to avoid changing 3rd party code
c20b4502 liblzma: Port to VS 6, 7.0
7a92eddb liblzma: Port from C99 to C89/90
b2a07ca4 liblzma: Add CMake build system
d44ad161 liblzma: Remove unused Makefile.* files
a53caea3 liblzma: Add README-CMake.txt
133d42fe Merge branch 'liblzma-upstream' into add-liblzma
c289e634 liblzma 5.0.5-gb69900ed (reduced)
8510533f liblzma: Add .gitattributes to ignore whitespace checks
 2014-07-29 08:52:08 -04:00
Brad King 65a0ea456d Help: Add notes for topic 'add-liblzma' 2014-07-29 08:45:36 -04:00
Daniel Pfeifer 8436d18115 CMake: Enable use of liblzma in libarchive (#14504) 
Build liblzma as part of CMake or find one on the system.  Modify our
port of libarchive to use the liblzma configured for use with CMake.
 2014-07-29 08:45:36 -04:00
Brad King 73eab246fb liblzma: Avoid defining a 'restrict' macro 
Any "#define restrict ..." line may conflict with MSVC header files
that use "__declspec(restrict)".  Define our own LZMA_RESTRICT macro
in "Utilities/cmliblzma/config.h.in" and transform liblzma code to
use it:

 git grep -lE '\<restrict\>' Utilities/cmliblzma/liblzma |
   xargs sed -i 's/\<restrict\>/LZMA_RESTRICT/g'
 2014-07-29 08:45:36 -04:00
Brad King 90e7a4d41f liblzma: Disable warnings to avoid changing 3rd party code 2014-07-29 08:45:36 -04:00
Daniel Pfeifer c20b45027e liblzma: Port to VS 6, 7.0 
Also remove use of MSVC intrinsic.
 2014-07-29 08:45:36 -04:00