26103 Commits

Author SHA1 Message Date
Kitware Robot
b6f6b0a983 CMake Nightly Date Stamp 2014-11-20 00:01:08 -05:00
Brad King
fa1a066af1 Merge branch 'backport-fix-CMP0054-MSVC' into fix-CMP0054-MSVC 2014-11-19 16:25:18 -05:00
Fraser Hutchison
4d52cd36ad Avoid if() quoted auto-dereference when checking for "MSVC"
When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not
allow the definition of the "MSVC" variable to be expanded.
2014-11-19 16:24:54 -05:00
Fraser Hutchison
543c4304bb Avoid if() quoted auto-dereference when checking for "MSVC"
When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not
allow the definition of the "MSVC" variable to be expanded.
2014-11-19 16:22:56 -05:00
Brad King
5ee198d76e Merge branch 'FindJava-no-osx-stub' into release 2014-11-19 16:15:43 -05:00
Brad King
dd378258f1 FindJava: Do not accept OS X stub 'java' as Java
OS X provides a stub 'java' to inform callers that Java is not present.
When checking the 'java -version' output, look for such a message and if
found pretend 'java' was not found.

Suggested-by: Sean McBride <sean@rogue-research.com>
2014-11-19 16:14:56 -05:00
Stephen Kelly
c03c184be0 Features: Record C++11 dialect switch only for GNU 4.7 and later.
Previous versions of GNU are not currently supported by this
CMake feature.
2014-11-19 09:39:44 +01:00
Kitware Robot
f7b6f3d967 CMake Nightly Date Stamp 2014-11-19 00:01:08 -05:00
Stephen Kelly
49e2b689a8 Features: Fix references to CXX compiler version in Clang-C.cmake. 2014-11-19 00:42:51 +01:00
Stephen Kelly
7565ab2cd1 Features: Test the CXX compiler only if it has features.
If using different C and CXX compilers, we might not have a
feature-full CXX compiler at this point.
2014-11-19 00:42:35 +01:00
Stephen Kelly
d49f1c5e94 Build CMake with most-recent available language dialect.
When CMake is built with CMake 3.1 or later, appropriate -std=
options will be added for GNU and Clang compilers while building
C and CXX code.

This allows taking advantage of 'hidden' language features such
as move-constructors, and allows the standard library to enable
the use of more-advanced features too, where available.

This does not change CMake host compiler requirements.
2014-11-19 00:32:03 +01:00
Stephen Kelly
26e98c34dc file(GENERATE): Re-run cmake when appropriate.
Re-run if the input file changes or if the output file is removed.

This only works with the Makefile generators currently.  The limitation
of the Ninja generator is tracked as issue #15256.  The IDE
generators will need larger refactoring as they currently rely on
being able to determine the depends and output files at the start of
generate-time, which is too early for the file(GENERATE) case.
2014-11-19 00:19:09 +01:00
Stephen Kelly
3bd59b6014 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible. 2014-11-18 23:20:40 +01:00
Stephen Kelly
bf00f5287b QtAutogen: Don't take a reference to temporary.
While a const reference to a temporary is standard conformant,
it doesn't seem to be necessary or advantageous here.
2014-11-18 23:20:40 +01:00
Ådne Hovda
7a68729223 ccmake: Cleanup and simplify conditional blocks for HP-UX 2014-11-18 10:03:35 -05:00
Ådne Hovda
44f02b42fb ccmake: Use standard getmaxyx instead of non-standard getmax[xy]
Swap out getmax[xy]() calls for single call to getmaxyx(), to support
strict X/Open conformant curses implementations, e.g. HP-UX Xcurses.
2014-11-18 10:02:33 -05:00
Ådne Hovda
ee3d06a41e ccmake: Remove incomplete support for cur_colr on old HP-UX
Enable support for the more modern Xcurses.
2014-11-18 10:02:08 -05:00
Gauthier Lamaison
51a60973eb CPackRPM: Unset temporary component variables before re-use
Improve the fix from commit v2.8.9~136^2 (CPackRPM: avoid leakage of RPM
directive from one component to another, 2012-06-05) to clean up more
temporary variables.

Reviewed-by: Domen Vrankar <domen.vrankar@gmail.com>
2014-11-18 09:25:10 -05:00
Brad King
d526ebc603 Merge topic 'vs-check-phone-store-tools'
689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228)
b20a32ac VS: Improve error messages when compiler is not detected (#15228)
2014-11-18 09:12:34 -05:00
Brad King
7a39d32f05 Merge topic 'update-curl'
46bbf947 curl: Check for OpenSSL headers independently
2014-11-18 09:12:32 -05:00
Brad King
ecdea34fcc Merge topic 'FindCurses-no-cur_colr'
d931ba60 FindCurses: Drop search for deprecated HP-UX cur_colr library
2014-11-18 09:12:28 -05:00
Brad King
397c762da4 Merge topic 'doc-sphinx-cmake-fixup'
5cda2205 Utilities/Sphinx: Add missing call to note_explicit_target
2014-11-18 09:12:25 -05:00
Kitware Robot
52fd5775d1 CMake Nightly Date Stamp 2014-11-18 00:01:08 -05:00
Brad King
bea609ac2a Merge branch 'vs-check-phone-store-tools' into release 2014-11-17 15:39:17 -05:00
Brad King
536baafb76 Merge branch 'doc-sphinx-cmake-fixup' into release 2014-11-17 15:39:09 -05:00
Brad King
5cda220548 Utilities/Sphinx: Add missing call to note_explicit_target
Sphinx calls document.note_explicit_target with any nodes.target() it
creates.  Add such a call when we create a document target in
CMakeTransform.
2014-11-17 15:37:31 -05:00
Brad King
d4fdfaaef1 Merge branch 'doc-target_include_directories-fixup' into release 2014-11-17 15:16:35 -05:00
Brad King
d903f7ce91 Merge topic 'doc-target_include_directories-fixup'
1d22ee67 Help: target_include_directories does not allow target names
2014-11-17 15:15:56 -05:00
Brad King
1d22ee67aa Help: target_include_directories does not allow target names
Since commit v2.8.11~227^2~1 (Don't allow targets args in the new target
commands, 2013-01-29) the target_include_directories command does not
support target names on the right hand side, but that commit forgot to
remove it from the docs.  It was never released with such support.
Update the command documentation now.
2014-11-17 14:47:42 -05:00
Brad King
3609fceee7 Merge topic 'ninja-minor-refactoring'
67bd514a Ninja: Refactor restat to be a string internally
ef42e57d Ninja: Use a TARGET_FILE variable to hold the link output file
592644c4 Tests/BuildDepends: Drop unneeded help for Ninja
2014-11-17 11:35:45 -05:00
Ådne Hovda
d931ba6021 FindCurses: Drop search for deprecated HP-UX cur_colr library
Since commit b22e2de8 (HPUX support, 2001-11-05) the FindCurses
module searches for a 'cur_colr' library, but that is not needed
anymore.  AFAICT, the cur_colr package was introduced in HP-UX 10.00 and
marked as deprecated in 10.30 by X/OPEN curses (which replaced the even
older HP curses in 10.10).

In order to use cur_colr after 10.10 you should use the
/usr/include/curses_colr when compiling.  Since FindCurses doesn't even
search that path the headers cannot possibly match out of the box.  If
users want cur_colr they can set the cache entries by hand.

There is no 64-bit version of cur_colr in 11.11PA and it will be gone
completely in 11.31PA:

  http://h21007.www2.hp.com/portal/download/files/unprot/STK/HPUX_STK/impacts/i964.html

It is simplest to drop cur_colr support from FindCurses since it was
only partially implemented anyway.
2014-11-17 10:32:52 -05:00
Brad King
46bbf94783 curl: Check for OpenSSL headers independently
Use check_include_file instead of check_include_file_concat to look
for OpenSSL headers.  They do not need to participate in a sequence
of dependent system headers.  Also they may cause winsock.h to be
included before ws2tcpip.h, causing the latter to not be detected
in the sequence.
2014-11-17 09:52:49 -05:00
Brad King
a42c51b5ab Merge branch 'release' 2014-11-17 09:45:39 -05:00
Brad King
598a316154 Merge branch 'vs14-is-2015' into release 2014-11-17 09:44:52 -05:00
Brad King
ec34b4b8f7 Merge branch 'kwsys-SharedForward-vs14' into release 2014-11-17 09:44:45 -05:00
Brad King
3502231410 Merge topic 'kwsys-SharedForward-vs14'
480ed9cd KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limit
2014-11-17 09:43:32 -05:00
Brad King
85bafee7eb Merge topic 'update-kwsys'
afc557d1 Merge branch 'upstream-kwsys' into update-kwsys
c5fcbe00 KWSys 2014-11-14 (dec9c30b)
2014-11-17 09:42:26 -05:00
Brad King
afc557d10e Merge branch 'upstream-kwsys' into update-kwsys 2014-11-17 09:41:57 -05:00
KWSys Robot
c5fcbe00af KWSys 2014-11-14 (dec9c30b)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ dec9c30b | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 5843f590..dec9c30b
Brad King (1):
      dec9c30b SharedForward: Hard-code the ldpath buffer size to below VS 14 limit

Change-Id: I3430e77f71e68c2eb4f29369080c97afb1613c33
2014-11-17 09:41:46 -05:00
Brad King
444f61e044 Merge topic 'console-pool'
2d75d7e5 Help: Add notes for topic 'console-pool'
f42d86f0 Ninja: Implement USES_TERMINAL using the console pool if available
f281ae01 Ninja: Remove unused declaration
d5eae556 Ninja: factor out the test for console pool support
4d1fedf4 Give the interactive cache editor the USES_TERMINAL property
fe5d6e8c Add USES_TERMINAL option for custom commands
ad6ee426 Rename doing_verbatim to doing_nothing
2014-11-17 09:40:56 -05:00
Brad King
033ed9a594 Merge topic 'test-custom-command-errors'
39baf728 Tests: Test add_custom_command and add_custom_target error cases
2014-11-17 09:40:54 -05:00
Brad King
e943fa8a19 Merge topic 'vs14-is-2015'
f5afb90d VS: Rename VS 14 generator to 'Visual Studio 14 2015'
2014-11-17 09:40:51 -05:00
Brad King
c61efbd684 Merge topic 'fix-vs2015-warnings'
b138be07 cmVisualStudio10TargetGenerator: fix a narrowing warning
8d379cd7 cmCallVisualStudioMacro: fix a shadowing warning
2014-11-17 09:40:47 -05:00
Brad King
ba007d3f07 Merge topic 'CPackRPM_SUBSTRING_-1'
5cc8169b CPackRPM: remove unneeded string length calculation
2014-11-17 09:40:45 -05:00
Brad King
545d10cc67 Merge topic 'string-SUBSTRING-truncate'
474bbb9d string: Tolerate SUBSTRING length exceeding end index
2014-11-17 09:40:44 -05:00
Brad King
557aef0b94 ExternalProject: Add options to specify BYPRODUCTS (#14963)
The external project's build process may generate byproducts on which
other rules in the driving project's build later depend.  Provide a way
for the driving project to specify what byproducts it expects to be made
available by the custom commands that drive the external project.
2014-11-17 09:36:42 -05:00
Gilles Khouzam
689cd0d43e VS: Do not produce WinMD file for OBJECT libraries (#15228)
They are implemented as static libraries for the IDE so treat them the
same.
2014-11-17 08:57:14 -05:00
Kitware Robot
d42e314900 CMake Nightly Date Stamp 2014-11-17 00:01:07 -05:00
Kitware Robot
f1cd1434a4 CMake Nightly Date Stamp 2014-11-16 00:01:07 -05:00
Kitware Robot
08348aec48 CMake Nightly Date Stamp 2014-11-15 00:01:17 -05:00