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
Daniele E. Domenichelli
4efef3f775
Help: Clarify that ARGV# beyond ARGC will have an undefined behavior ( #15380 )
2015-02-26 17:42:30 +01:00
Daniele E. Domenichelli
e3363bfbec
Help: Refine the .rst formatting of macro and function documentation
2015-02-26 17:19:52 +01:00
Brad King
d1082448a8
Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'
2015-02-26 10:21:09 -05:00
Gregor Jasny
ce935ebe50
cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
...
The Ninja build system does not support a in-file verbositiy switch.
Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE
setting and pass it as an optional '-v' argument to Ninja. This can
serve as a reasonable fallback.
Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
2015-02-26 09:51:11 -05:00
Brad King
266568654c
Merge branch 'upstream-kwsys' into update-kwsys
2015-02-26 08:54:42 -05:00
KWSys Robot
5e2b418f7b
KWSys 2015-02-25 (1b75ad3d)
...
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 1b75ad3d | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' d4e7f08e..1b75ad3d
Domen Vrankar (3):
2b042ff6 SystemTools: Optionally report error from GetRealPath
7c9a970a Glob: Remove dead code
1b75ad3d Glob: Remove addition of extra '/'
Change-Id: I04ac5aa4748925bc953db0abff2d4418080882b5
2015-02-26 08:54:37 -05:00
Brad King
4817d2814a
Merge topic 'windows-rc-enable-later'
...
772eae44
RC: Add platform-specific preprocessor definitions (#15404 )
4300de3e
RC: Enable language after C, CXX, or Fortran is enabled (#15404 )
1de4a0fb
RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
2015-02-26 08:52:09 -05:00
Brad King
e4419c9f88
Merge topic 'ExternalData-url-algo-map'
...
f7f4ca55
ExternalData: Add support for custom algorithm-to-URL mapping
2015-02-26 08:51:52 -05:00
Kitware Robot
1c3799b151
CMake Nightly Date Stamp
2015-02-26 00:01:08 -05:00
Brad King
772eae4464
RC: Add platform-specific preprocessor definitions ( #15404 )
...
In Platform/Windows-MSVC the C and CXX flags are initialized to
contain preprocessor definitions describing the platform. On
WinCE platforms this may not be just -DWIN32. This information
may be important to RC sources too, so add such preprocessor
definitions to the default RC flags.
Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
2015-02-25 11:29:45 -05:00