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

27252 Commits

Author SHA1 Message Date
Nils Gladitz 2e16aff1e2 CPackWIX: Fix .wixobj output locations and filenames. 
Preserve all but the last extension when generating .wixobj output
filenames from source files and make sure they are unique.

Output .wixobj files in cpack staging area instead
of the current working directory.
 2015-03-06 21:09:19 +01:00
Nils Gladitz b0852ebc09 CPackWIX: Support patching of root <Feature> elements. 2015-03-06 21:06:42 +01:00
Kitware Robot 8f38b8a443 CMake Nightly Date Stamp 2015-03-06 00:01:09 -05:00
Kitware Robot 67a74c4454 CMake Nightly Date Stamp 2015-03-05 00:01:09 -05:00
Brad King df5def5334 Merge topic 'InstallRequiredSystemLibraries-COMPONENT' 
e97141c2 InstallRequiredSystemLibraries: Add option to specify install COMPONENT
d6a320ab InstallRequiredSystemLibraries: Format documentation
 2015-03-04 08:52:14 -05:00
Brad King 4ef21206e6 Merge topic 'fix-JOM-quiet-make' 
3e98ebba JOM: Pass /NOLOGO when driving builds as is done for NMake
 2015-03-04 08:52:12 -05:00
Brad King 49ce2c999f Merge branch 'release' 2015-03-04 08:43:05 -05:00
Kitware Robot ebcb75e626 CMake Nightly Date Stamp 2015-03-04 00:01:09 -05:00
Johan Andruejol e97141c2bc InstallRequiredSystemLibraries: Add option to specify install COMPONENT 
Previously the module did not support projects using installation
components because install(PROGRAMS) was never called with COMPONENT.
Add an option to specify the COMPONENT so that projects doing this do
not have to resort to using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP and
writing the install rule by hand.
 2015-03-03 09:17:47 -05:00
Brad King d6a320ab5e InstallRequiredSystemLibraries: Format documentation 2015-03-03 09:14:29 -05:00
Brad King a49a467fd0 CMake 3.2.0 2015-03-03 08:38:36 -05:00
Brad King 1049feaab6 Merge branch 'release' 2015-03-03 08:34:46 -05:00
Brad King 687065e22a Merge topic 'backport-KWSys-SystemTools-CopyFileAlways-fix' 
b8ea771b KWSys SystemTools: Update CopyFileAlways stream library workarounds
 2015-03-03 08:34:31 -05:00
Brad King ad162206f0 Merge topic 'cpack-strict-variable-selection' 
3b9f963f CPack: be more stringent when selecting variables to encode
 2015-03-03 08:32:56 -05:00
Brad King 9babde423c Merge topic 'update-kwsys' 
e88f3b3b Merge branch 'upstream-kwsys' into update-kwsys
7c9afb57 KWSys 2015-02-27 (d2aa1afd)
 2015-03-03 08:32:54 -05:00
Kitware Robot 0261198653 CMake Nightly Date Stamp 2015-03-03 00:01:09 -05:00
Brad King 3e98ebbaef JOM: Pass /NOLOGO when driving builds as is done for NMake 
This fixes RunCMake.(Configure|configure_file|try_compile) test
failures that failed to match empty stderr due to jom printing
its identification line.
 2015-03-02 10:08:09 -05:00
Роман Донченко 3b9f963f3f CPack: be more stringent when selecting variables to encode 
The old version would admit, for example, a variable named "xxxCPACK".
 2015-03-02 09:01:31 -05:00
Brad King eb3bced50f Merge branch 'backport-KWSys-SystemTools-CopyFileAlways-fix' into release 2015-03-02 08:55:21 -05:00
Paul Martin b8ea771b13 KWSys SystemTools: Update CopyFileAlways stream library workarounds 
On some stream libraries failbit is not set when trying to read past
EOF.  Instead, always exit the copy loop when gcount() is zero.
 2015-03-02 08:55:13 -05:00
Brad King e88f3b3bcc Merge branch 'upstream-kwsys' into update-kwsys 2015-03-02 08:41:17 -05:00
KWSys Robot 7c9afb5738 KWSys 2015-02-27 (d2aa1afd) 
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ d2aa1afd | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 1b75ad3d..d2aa1afd
Paul Martin (1):
      d2aa1afd SystemTools: Update CopyFileAlways stream library workarounds

Change-Id: I676f2f11ac0d52f7ffc3af5bb444d3726c121be0
 2015-03-02 08:41:11 -05:00
Brad King 56be75b310 Merge branch 'release' 2015-03-02 08:37:23 -05:00
Brad King 5261c357ae Merge topic 'locale-agnostic-findhg' 
cfb22354 FindHg: Run hg with C locale when querying its version.
 2015-03-02 08:36:31 -05:00
Brad King b3381c5c79 Merge topic 'modules-check-ARGC' 
a7631fc4 Modules: Check for ARGC before using ARGV#
 2015-03-02 08:36:29 -05:00
Brad King e2055b172e Merge topic 'fix-ctest-update-locale' 
6a661f06 CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.
 2015-03-02 08:36:26 -05:00
Brad King 17b4423c45 Merge topic 'fix-crash-on-bad-LANG_STANDARD' 
00d66557 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
 2015-03-02 08:36:24 -05:00
Kitware Robot a8b2224eb6 CMake Nightly Date Stamp 2015-03-02 00:01:08 -05:00
Kitware Robot 1c29a5583c CMake Nightly Date Stamp 2015-03-01 00:01:09 -05:00
Brad King 6b6852a0eb Merge branch 'fix-crash-on-bad-LANG_STANDARD' into release 2015-02-28 12:15:34 -05:00
Brad King 00d66557d4 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426) 2015-02-28 12:14:42 -05:00
Nils Gladitz cfb22354b8 FindHg: Run hg with C locale when querying its version. 
LANGUAGE should be ignored when LC_ALL=C.
It seems this isn't the case with hg so set both.
 2015-02-28 14:22:41 +01:00
Kitware Robot ae09fce831 CMake Nightly Date Stamp 2015-02-28 00:01:09 -05:00
Daniele E. Domenichelli a7631fc4e0 Modules: Check for ARGC before using ARGV# 
ARGV# could be defined from a parent scope.
 2015-02-27 10:59:23 -05:00
Brad King ed8055f418 Merge branch 'release' 2015-02-27 10:39:04 -05:00
Brad King d853cb238c Merge topic 'macro-function-docs' 
4efef3f7 Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380)
e3363bfb Help: Refine the .rst formatting of macro and function documentation
 2015-02-27 10:34:40 -05:00
Brad King 29b5ca108e Merge topic 'remove_error_read_script' 
6bf13097 CTest: Drop "Error in read script" message at end of testing
 2015-02-27 10:34:38 -05:00
Brad King 0bf6c7fa7b Merge topic 'cmake-build-ninja-verbose' 
d1082448 Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'
ce935ebe cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
 2015-02-27 10:34:36 -05:00
Brad King 38f1f4e7f3 Merge topic 'install-manifest-optimize' 
c4814174 install: Write the entire installation manifest at once
 2015-02-27 10:34:35 -05:00
Brad King 83a9cf6d28 Merge topic 'cpack_rpm_mulit_prefix_fixup-for-master' 
3db740cb CPackRPM: Consolidate CPackComponentsForAll test case coverage
3cf86d9e Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master
1cbb1562 CPackRPM: Fix handling of relocation prefix parent directories
 2015-02-27 10:34:33 -05:00
Brad King ee81de5ec3 Merge topic 'update-kwsys' 
26656865 Merge branch 'upstream-kwsys' into update-kwsys
5e2b418f KWSys 2015-02-25 (1b75ad3d)
 2015-02-27 10:34:31 -05:00
Nils Gladitz 6a661f0603 CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES. 
If LC_ALL is set it takes precedence over LC_MESSAGES.
 2015-02-27 16:32:03 +01:00
Zack Galbreath 6bf130979e CTest: Drop "Error in read script" message at end of testing 
A more-specific error message is always displayed earlier in the
output if any real error occurred.  This final summary message
is distracting to readers searching through the output for the
word "error".  Simply drop it.
 2015-02-27 10:31:02 -05:00
Brad King 4932f59b4c Merge branch 'cpack_rpm_mulit_prefix_fixup' into release 2015-02-27 08:48:45 -05:00
Domen Vrankar 3db740cb31 CPackRPM: Consolidate CPackComponentsForAll test case coverage 
Use test infrastructure added by commit 1cbb1562 (Fix handling of
relocation prefix parent directories, 2015-02-26) to cover the same use
cases from tests added by commit 5857ca5e (CPackRPM: Drop explicit
handling of '@' symbols that breaks them, 2015-01-07) and drop the
latter.
 2015-02-27 08:45:57 -05:00
Domen Vrankar 3cf86d9e7b Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master 
Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
by combining the changes from both sides.
 2015-02-27 08:42:29 -05:00
Domen Vrankar 1cbb156253 CPackRPM: Fix handling of relocation prefix parent directories 
In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes
for one package, 2015-01-21) a regression was introduced that causes
parent directories of relocation paths to be incorrectly included in
the rpm.  Fix this and make the test case more strict to cover it.
 2015-02-27 08:37:24 -05:00
Kitware Robot 4bef659da5 CMake Nightly Date Stamp 2015-02-27 00:01:09 -05:00
Brad King 693a944736 Merge branch 'install-manifest-optimize' into release 2015-02-26 15:06:00 -05:00
Robert Goulet c48141744e install: Write the entire installation manifest at once 
Avoid a separate open/close for each file installed.  Use a single
file(WRITE) instead of a loop with file(APPEND).
 2015-02-26 15:04:07 -05:00