Commit Graph

31819 Commits

Author SHA1 Message Date
Brad King d38fc22132 Merge branch 'update-libarchive' into release 2016-06-20 10:53:25 -04:00
Brad King 52f58267c3 Merge branch 'upstream-LibArchive' into update-libarchive
* upstream-LibArchive:
  LibArchive 2016-06-19 (139d0576)
2016-06-20 10:50:13 -04:00
LibArchive Upstream 2b94d71d88 LibArchive 2016-06-19 (139d0576)
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 139d0576b51a253732a5ab1f66805dffbf8b00af (master).
2016-06-20 10:50:05 -04:00
Brad King c8f139a16b Merge branch 'cpack-deb-test-fixes' into release 2016-06-20 09:29:22 -04:00
Domen Vrankar 6107fab467 CPack/Deb: Fix test to actually test the preinst script
The test regex variable name was invalid and did not test preinst
script.

Reported-by: Patrick <mail6543210@yahoo.com.tw>
2016-06-20 09:29:11 -04:00
Domen Vrankar 302391bae6 CPack/Deb: Fix tests for SELinux-enabled systems
Suggested-by: Patrick <mail6543210@yahoo.com.tw>
2016-06-20 09:29:11 -04:00
Brad King 4fdb97db8d Merge branch 'pkgconfig-targets' into release 2016-06-20 09:24:30 -04:00
Brad King 45b62646db Merge branch 'FindQt4-doc-QtDeclarative-imported' into release 2016-06-20 09:09:08 -04:00
Brad King 5ed2881cb2 FindQt4: Document Qt4::QtDeclarative imported target (#16157) 2016-06-20 08:49:31 -04:00
Rolf Eike Beer 8345c6463d FindPkgConfig: define the imported targets also when the data comes from cache 2016-06-19 09:35:05 +02:00
Brad King c37e6e226c Merge branch 'doc-issue-tracker-move' into release 2016-06-17 15:39:35 -04:00
Brad King 588166f804 README: Update Issue Tracker link to new location 2016-06-17 15:38:07 -04:00
Brad King 3a50c55ff6 Merge branch 'CodeBlocks-include-order' into release 2016-06-17 10:40:14 -04:00
Tobias Hunger 76b462eacb cmExtraCodeBlocksGenerator: Do not shuffle include directories
Report include directories in a sensible order. Do not shuffle them
when trying to make them unique.
2016-06-17 10:37:29 -04:00
Brad King 4160d68189 Merge branch 'revert-vs-clang-minsize' into release 2016-06-17 10:20:16 -04:00
Brad King 78249be29d VS: Fix regressed mapping for the cl `/Os` compiler flag
In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct
compiler settings, 2016-02-18) a flag mapping was added for the clang
`-Os` flag.  However, this collides with a mapping we already had for
the MSVC flag of the same name.  This is a symptom of a larger problem
in that the VS generators need a per-toolset flag map (issue #16153).

For now, simply drop the new mapping and drop `-Os` from clang compiler
flags in the MinSizeRel configuration.

Reported-by: Felix Bruns <felixbruns@gmail.com>
2016-06-17 10:18:47 -04:00
Brad King 9f3546bbb4 CMake 3.6.0-rc2 2016-06-13 10:28:02 -04:00
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