24243 Commits

Author SHA1 Message Date
Brad King
58557486db Merge topic 'dont-rewrite-moc-parameter-file'
17c31b8b Qt4: Extend the Qt4Targets test to cover dir and target moc parameters.
6a5bd7f0 Qt4: write moc parameter file only when content has changed
2014-05-06 13:48:40 -04:00
Brad King
4345cf36ac Merge topic 'hpux-compile'
500d83ba CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags
f347fd12 CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC
4ca9b008 CompileFlags: Test for C++ features after selecting flags
2014-05-06 13:48:37 -04:00
Stephen Kelly
17c31b8bd4 Qt4: Extend the Qt4Targets test to cover dir and target moc parameters. 2014-05-06 13:39:45 -04:00
Brad King
9cb4677509 Merge branch 'hpux-compile' into release 2014-05-06 13:29:05 -04:00
Rolf Eike Beer
500d83ba8c CompileFlags: add better selection which aCC version gets -AA +hpxstd98 flags 2014-05-06 13:25:01 -04:00
Rolf Eike Beer
f347fd12f3 CompileFlags: Add -AA +hpxstd98 on HP-UX 11.11 with aCC
These flags are needed to enable support for C++98.  Also teach the
'bootstrap' script to add them if necessary.
2014-05-06 13:23:58 -04:00
Rolf Eike Beer
4ca9b0086f CompileFlags: Test for C++ features after selecting flags
Some flags we select may affect availability of C++ features.
2014-05-06 13:23:51 -04:00
Clinton Stimpson
5dfe9b7d5a Xcode: Find fallback SDK if one matching the OS version doesn't exist.
For example if one installs Xcode 4.6 on OS X 10.9, it doesn't contain
a 10.9 SDK, so fallback to the next newest version which, in this case,
happens to be a 10.8 SDK.

This fixes bug #14572.
2014-05-06 09:18:00 -06:00
Brad King
b121436bd0 Merge branch 'backport-kwsys-compile-fix' into release 2014-05-06 10:06:31 -04:00
Brad King
8c5b9cf915 KWSys SystemInformation: Include backtrace APIs whenever we use them
Include execinfo.h, cxxabi.h, and dlfcn.h under the same conditions
under which we use the APIs from them.  Move their inclusion out of
OS-specific blocks.
2014-05-06 10:05:01 -04:00
Brad King
dcae93ee07 Merge branch 'InstallRequiredSystemLibraries-vs12-mfc' into release 2014-05-06 10:02:08 -04:00
Felix Krause
c0a6646d2f InstallRequiredSystemLibraries: MBCS MFC is optional on VS 12 (#14903)
The MBCS (Multi-Byte Character Set) has been deprecated with VS 2013,
and MSVC no longer ships with an MBCS-version of MFC by default.
However, it can be downloaded as an add-on.

Teach InstallRequiredSystemLibraries to install the MBCS MFC only
for VS < 12 or if it happens to exist on the system.
2014-05-06 08:54:39 -04:00
Brad King
edad036971 Merge branch 'upstream-kwsys' into update-kwsys 2014-05-06 08:46:59 -04:00
KWSys Robot
397bccbaa9 KWSys 2014-05-05 (f3a36760)
Extract upstream KWSys using the following shell commands.

$ git archive --prefix=upstream-kwsys/ f3a36760 | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 8b085635..f3a36760
Brad King (2):
      1979c02d hashtable: Poison operator= on internal node type
      f3a36760 SystemInformation: Include backtrace APIs whenever we use them

Change-Id: Ic90b29e4fbae139ab6c8bd7355661759153e0aa7
2014-05-06 08:46:54 -04:00
Kitware Robot
f410c03142 CMake Nightly Date Stamp 2014-05-06 00:01:08 -04:00
Daniele E. Domenichelli
93730bb3e0 ExternalProject: Set FOLDER property to targets
This is useful when using the USE_FOLDERS global property
2014-05-05 18:49:41 +02:00
Daniele E. Domenichelli
39ef804602 ExternalProject: Set LABELS property to targets
This is useful for using CDash subprojects.
2014-05-05 18:49:41 +02:00
Kitware Robot
1aed32faae CMake Nightly Date Stamp 2014-05-05 00:01:06 -04:00
Kitware Robot
f16fdc0263 CMake Nightly Date Stamp 2014-05-04 00:01:09 -04:00
Kitware Robot
33696e8331 CMake Nightly Date Stamp 2014-05-03 00:01:07 -04:00
Ben Boeckel
01b79c6385 ninja: Don't use a stringstream to build an argument list
Streams are expensive to construct (looks like some locale-related
stuff), so use strings instead.
2014-05-02 13:22:19 -04:00
Ben Boeckel
3c64089117 ninja: Use string parameters 2014-05-02 13:05:44 -04:00
Stephen Kelly
3fdfa5d3fc Features: Make CMAKE_CXX_KNOWN_FEATURES a property.
As a 'built-in' variable it imposes a cost on all variable lookups
and it is expected to be rarely used.
2014-05-02 10:18:16 +02:00
Kitware Robot
2615185418 CMake Nightly Date Stamp 2014-05-02 00:01:07 -04:00
Brad King
a354a8ba5e Merge topic 'UseSWIG-guess_module_name'
145d653e Help: Add notes for topic 'UseSWIG-guess_module_name'
2014-05-01 09:36:16 -04:00
Brad King
4cbce89ba9 Merge topic 'ExternalData-missing-not-fatal'
4a5cf964 Help: Add notes for topic 'ExternalData-missing-not-fatal'
2014-05-01 09:36:12 -04:00
Brad King
33e04542b1 Merge branch 'release' 2014-05-01 09:30:13 -04:00
Brad King
145d653e5f Help: Add notes for topic 'UseSWIG-guess_module_name' 2014-05-01 09:27:16 -04:00
Brad King
4a5cf96453 Help: Add notes for topic 'ExternalData-missing-not-fatal' 2014-05-01 09:22:30 -04:00
Brad King
ecdc1985e3 Merge topic 'file-generate-if-different'
42e1cd13 file(GENERATE): Only write the file if content is different.
2014-05-01 09:11:23 -04:00
Brad King
dc8505cad6 Merge topic 'FindCUDA-cubin-fatbin'
80209fdb Help: Add notes for topic 'FindCUDA-cubin-fatbin'
231b30db FindCUDA: Add support for compilation to fatbin & cubin modules
2014-05-01 09:11:21 -04:00
Brad King
6482fbaf70 Merge topic 'ExternalProject-verify-cmake-var'
420280f3 ExternalProject: Fix path to cmake in verify script
2014-05-01 09:11:18 -04:00
Brad King
556e3a2574 Merge topic 'drop-release-on-ferrari'
c962c21c Utilities/Release: Drop IRIX binary generation on ferrari
2014-05-01 09:11:14 -04:00
Brad King
80209fdb7b Help: Add notes for topic 'FindCUDA-cubin-fatbin' 2014-05-01 09:02:34 -04:00
Kitware Robot
849d869223 CMake Nightly Date Stamp 2014-05-01 00:01:12 -04:00
Brad King
c553d68798 Merge branch 'ExternalProject-verify-cmake-var' into release 2014-04-30 16:29:48 -04:00
Brad King
420280f322 ExternalProject: Fix path to cmake in verify script
In commit v3.0.0-rc1~103^2~3 (ExternalProject: Reattempt download when
verification fails, 2014-01-15) a reference to ${CMAKE_COMMAND} was
added to generate a reference to the CMake command in a cmake script.
Escape the '$' so that the literal variable reference appears in the
script instead of writing the path to the current cmake.  This is
necessary when the path to CMake contains spaces or other characters
special to CMake syntax.
2014-04-30 16:21:58 -04:00
Brad King
d41adb440f Merge topic 'osx-init-early'
bbc358c3 Merge branch 'master' into osx-init-early
0cce556b Xcode: Use sysroot and deployment target to identify compiler
0200d0a9 OS X: Factor a Darwin-Initialize module out of Platform/Darwin
416761e3 Add platform-specific initialization step when enabling languages
2014-04-30 09:42:02 -04:00
Brad King
8535d4cf5d Merge topic 'cxx98-features'
a36b957f Features: Add cxx_template_template_parameters.
2014-04-30 09:42:00 -04:00
Brad King
a676ced346 Merge branch 'release' 2014-04-30 09:26:39 -04:00
Brad King
c962c21c85 Utilities/Release: Drop IRIX binary generation on ferrari
This machine has been decommissioned.  See also SGI announcements:

 SGI Support of MIPS IRIX Products Changes December 2013
 https://www.sgi.com/services/support/irix_mips_support.html
 https://www.sgi.com/products/software/irix/
2014-04-30 09:22:01 -04:00
Stephen Kelly
42e1cd137c file(GENERATE): Only write the file if content is different.
No policy is used to control this behavior for now.
2014-04-30 15:18:13 +02:00
Tobias Zirr
231b30dbfb FindCUDA: Add support for compilation to fatbin & cubin modules 2014-04-30 09:02:52 -04:00
Kitware Robot
b0e955f129 CMake Nightly Date Stamp 2014-04-30 00:01:07 -04:00
Ben Boeckel
3f51752264 StoreMatches: Minor cleanups 2014-04-29 16:00:06 -04:00
Ben Boeckel
ef62fbad55 ClearMatches: Store match variable names statically
Constructing the names and then turning them into a std::string is
non-negligible in performance testing.
2014-04-29 16:00:05 -04:00
Ben Boeckel
f718b30a95 ClearMatches: Only clear matches which were actually set
ClearMatches was clearing many variables which were never set in the
first place. Instead, store how many matches were made last time and
only clear those. It is moved to the cmMakefile class since it is a
common utility used by multiple commands.
2014-04-29 16:00:05 -04:00
Brad King
9442928745 Merge topic 'UseSWIG-go-support'
a3b1be5e UseSWIG: Add support for Go and Lua
2014-04-29 09:58:50 -04:00
Brad King
3681cc437d Merge topic 'doc-singlehtml'
aaa6c8a6 Merge branch 'master' into doc-singlehtml
faf291a9 Utilities/Sphinx: Add option to build 'singlehtml' format
2014-04-29 09:58:48 -04:00
Brad King
1b5fac4695 Merge topic 'doc-full-help'
478356e6 Restore --help-full option to output all help manuals
2014-04-29 09:58:46 -04:00