Commit Graph

31852 Commits

Author SHA1 Message Date
Brad King 023e2a1eb7 Merge branch 'bash-completion' into release 2016-06-10 10:47:47 -04:00
Eric NOULARD 797c3c54e8 bash-completion: Add cpack --help-{manual,module,policy,property} 2016-06-10 10:46:33 -04:00
Eric NOULARD b08cae9b0e bash-completion: Add ctest --help-{manual,module,policy,property,variable} 2016-06-10 10:46:19 -04:00
Eric NOULARD 48cb388ead bash-completion: Fix cmake --help-policy lookup 2016-06-10 10:45:25 -04:00
Eric NOULARD f67afbdc4a bash-completion: Add cmake --help-manual 2016-06-10 09:54:29 -04:00
Brad King cc7e9d1d90 Merge branch 'cmake-gui-osx-symlink-qt5-plugin' into release 2016-06-09 13:21:56 -04:00
Robert Maynard f28401554a cmake-gui: Teach Qt5 where plugins are when launched through a symlink
When we are on OSX and we are launching cmake-gui from a symlink, the
application will fail to launch as it can't find the qt.conf file which
tells it what the name of the plugin folder is. We need to add this path
BEFORE the application is constructed as that is what triggers the
searching for the platform plugins
2016-06-09 13:21:27 -04:00
Brad King b55039ce5b Merge branch 'doc-ctest_update' into release 2016-06-08 10:03:41 -04:00
Brad King 1b18180ed4 Help: Document CTest Git fetch-and-reset behavior 2016-06-08 09:58:43 -04:00
Brad King 558e4d1ed6 Help: Document ctest_update branch following behavior 2016-06-08 09:53:13 -04:00
Brad King fb30b1a282 Merge branch 'fix-libarchive-openssl-no-hashes' into release 2016-06-07 15:08:14 -04:00
Brad King dbc9f73d0e libarchive: Restore OpenSSL include directory from upstream
In commit v3.6.0-rc1~100^2 (libarchive: Drop early use of crypto
library, 2016-05-03) we accidentally dropped the include directory for
OpenSSL as well as the library.  Without that, it works only
accidentally when CHECK_CRYPTO happens to choose the OpenSSL
implementation and add the include directory.

Reported-by: Bradley Lowekamp <blowekamp@mail.nih.gov>
2016-06-07 15:05:11 -04:00
Brad King cd1f0a824e Merge branch 'update-expat' into release 2016-06-06 09:10:48 -04:00
Brad King 182f645801 Merge branch 'upstream-expat' into update-expat
* upstream-expat:
  expat 2016-06-05 (2b9cb7f5)
2016-06-06 09:08:33 -04:00
Expat Upstream eb83112347 expat 2016-06-05 (2b9cb7f5)
Code extracted from:

    http://git.code.sf.net/p/expat/code_git

at commit 2b9cb7f5b59397d2d04117a419cd3d9d50f4a1ed (master).
2016-06-06 09:08:21 -04:00
Brad King cd1327bb9c Merge branch 'SunOS-PathScale' into release 2016-06-06 09:01:00 -04:00
Michał Górny fcfe121fd8 Platform: add flag definitions for PathScale compiler on SunOS (#16135) 2016-06-06 08:58:20 -04:00
Brad King 236b7cbe6e Merge branch 'FindLibArchive-3.2' into release 2016-06-03 13:27:34 -04:00
Orion Poplawski 38d18bab54 FindLibArchive: Support libarchive 3.2 version string format 2016-06-03 13:18:03 -04:00
Brad King 9703b32c1c Merge branch 'FindHDF5-fix-already-found' into release 2016-06-02 14:56:09 -04:00
Chuck Atkins f11243d13e FindHDF5: Add backwards compatability for already-found searches 2016-06-02 14:46:32 -04:00
Brad King 7e8cfb9549 Merge branch 'fix-TARGET_PROPERTY-LOCATION-crash' into release 2016-06-02 11:08:09 -04:00
Brad King f500a784d0 Fix crash on $<TARGET_PROPERTY:...,LOCATION> genex (#16134)
Policy CMP0026 deprecated the LOCATION property, and we have long
provided a $<TARGET_FILE:...> generator expression.  However, if
a project tries to use $<TARGET_PROPERTY:...,LOCATION> we should
at least not crash.

The compatibility implementation of the LOCATION property uses
cmGlobalGenerator::CreateGenerationObjects to create the structures
needed to evaluate the property before generation starts.  The
implementation assumed that accessing the property could only be done
during configuration (via the typical get_property command use case).
The $<TARGET_PROPERTY:...,LOCATION> genex causes the LOCATION property
to be accessed during generation.  Calling CreateGenerationObjects
during generation blows away all the objects currently being used for
generation and is not safe.  Add a condition to call it only when
configuration is not finished.
2016-06-02 10:58:38 -04:00
Brad King aa483a4053 Merge branch 'fix-ti-link-order' into release 2016-06-02 09:40:11 -04:00
Alexander Stein 89317915d9 Compiler/TI: Pass libraries as last part to linker
If e.g. libc.a is passed before any objects the linker raises the follwing
warning: cannot resolve archive libc.a to a compatible library, as no
input files have been encountered
In the end the library is skipped and missing symbols occur.

Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
2016-06-02 09:39:25 -04:00
Brad King 91f6e7904a CMake 3.6.0-rc1 version update 2016-06-01 10:57:43 -04:00
Brad King 4c2993df63 Help: Drop development topic notes to prepare release
Release versions do not have the development topic section of
the CMake Release Notes index page.
2016-06-01 10:55:45 -04:00
Brad King 9d81f1b3aa Merge topic 'doc-3.6-relnotes'
98eafa9b Help: Organize and revise 3.6 release notes
c5df7483 Help: Consolidate 3.6 release notes
2016-06-01 10:53:53 -04:00
Brad King 98eafa9b5f Help: Organize and revise 3.6 release notes
Add section headers similar to the 3.5 release notes and move each
individual bullet into an appropriate section.  Revise a few bullets.
2016-06-01 10:30:34 -04:00
Brad King c5df7483f5 Help: Consolidate 3.6 release notes
Move all development release notes into a new version-specific document:

 tail -q -n +3 Help/release/dev/* > Help/release/3.6.rst
 git rm -- Help/release/dev/*

except the sample topic:

 git checkout HEAD -- Help/release/dev/0-sample-topic.rst

Reference the new document from the release notes index document.
Add a title and intro sentence to the new document by hand.
2016-06-01 09:12:10 -04:00
Brad King 62adedbf5e Merge topic 'UseJava-fix-typo'
bcf39688 UseJava: Fix grammar error in documentation
2016-06-01 09:05:58 -04:00
Brad King 4062d6d694 Merge topic 'minor-cleanups'
bd4fef64 cmSourceFileLocation: Fix typo in comment
814e774e cmSearchPath: Fix typo in comment
2016-06-01 09:04:48 -04:00
Brad King 7642dde19e Merge topic 'cpack-documentation-improvements'
20e55e4b CPackRPM and CPackDeb documentation improvements
2016-06-01 09:04:44 -04:00
Tobias Hunger bd4fef6406 cmSourceFileLocation: Fix typo in comment 2016-06-01 08:33:48 -04:00
Tobias Hunger 814e774eff cmSearchPath: Fix typo in comment 2016-06-01 08:33:35 -04:00
Domen Vrankar 20e55e4be8 CPackRPM and CPackDeb documentation improvements 2016-06-01 08:29:34 -04:00
Kitware Robot adc7fcd013 CMake Nightly Date Stamp 2016-06-01 00:01:07 -04:00
Matthew Woehlke bcf3968851 UseJava: Fix grammar error in documentation 2016-05-31 10:30:57 -04:00
Brad King ebcc13e1b3 Merge topic 'suppress-dashboard-warnings'
d4e58dd9 CTestCustom: Suppress scanbuild warning on unsigned left shift
154fa2c5 CTestCustom: Suppress warnings about rand() on OpenBSD
e4a361bb CTestCustom: Suppress Windows manifest unrecognized element warning
2016-05-31 10:26:51 -04:00
Kitware Robot 88ede8e5ea CMake Nightly Date Stamp 2016-05-31 00:01:06 -04:00
Kitware Robot 8afadaa5b2 CMake Nightly Date Stamp 2016-05-30 00:01:05 -04:00
Kitware Robot e0fbd95f06 CMake Nightly Date Stamp 2016-05-29 00:01:05 -04:00
Kitware Robot 797a332a61 CMake Nightly Date Stamp 2016-05-28 00:01:06 -04:00
Brad King d4e58dd979 CTestCustom: Suppress scanbuild warning on unsigned left shift
The Clang scanbuild tool warns:

    Utilities/cmliblzma/liblzma/simple/x86.c:106:23: warning:
    The result of the '<<' expression is undefined
      src = dest ^ ((1u << (32 - i * 8)) - 1);
                     ~~~^~~~~~~~~~~~~~~

AFAIK overflow of a left shift on an unsigned type is well-defined.
2016-05-27 09:25:37 -04:00
Brad King 154fa2c544 CTestCustom: Suppress warnings about rand() on OpenBSD
We first suppressed this in commit v3.1.0-rc1~647^2 (CTestCustom:
Suppress warnings about rand() and srand() on OpenBSD, 2014-04-12).
Add another variant of the warning wording.
2016-05-27 09:25:37 -04:00
Brad King e4a361bbbf CTestCustom: Suppress Windows manifest unrecognized element warning
Our `cmake.version.manifest` file uses a "compatibility" element for
Windows 10 support.  Older MS tools warn about it being unknown, so
suppress the warning.
2016-05-27 09:25:37 -04:00
Brad King fb1f5d50af Merge topic 'remove-needless-copies'
27ead963 Remove unnecessary local copies.
618fb23f Pass arguments that are not modified as const&.
2016-05-27 09:08:21 -04:00
Brad King 82c286393a Merge topic 'remove-needless-c_str'
1b2bb933 Remove redundant c_str() calls.
2016-05-27 09:08:18 -04:00
Brad King 07983bcbfa Merge topic 'osx-no-warn-sdk-target-mismatch'
cffe0ed7 OS X: Drop warning about SDK and deployment target version mismatch
2016-05-27 09:08:15 -04:00
Kitware Robot fdb474d456 CMake Nightly Date Stamp 2016-05-27 00:01:07 -04:00