7a30fa1a41
CPackIFW: Fix attributes for Promoting Updates repository replacement
...
Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW:
Add support for Promoting Updates, 2016-05-17).
2016-07-05 15:55:42 -04:00
c7e0c3005b
Merge branch 'FindJNI-ubuntu-paths' into release
2016-07-05 14:34:02 -04:00
26d16380b0
FindJNI: Fix support for Ubuntu 15.10
...
The library search paths added by commit v3.6.0-rc1~281^2~1 (FindJNI:
Add support for Ubuntu 15.10, 2016-03-08) were incorrect. Fix them.
2016-07-05 14:33:46 -04:00
48680ade09
Merge branch 'clang-format-script' into release
2016-06-30 16:13:46 -04:00
a77d597b86
clang-format.bash: Fix filter-branch example documentation
...
Inside `git filter-branch --tree-filter` we must format all tracked
files because formatting of the tree for each commit is independent
from earlier commits.
2016-06-30 16:11:36 -04:00
3e4c2334b8
Merge branch 'doc-updates' into release
2016-06-30 09:06:26 -04:00
c05d240ef7
Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES example
...
Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
2016-06-30 09:03:41 -04:00
dab3ccf294
InstallRequiredSystemLibraries: Document UCRT option use case
...
Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
2016-06-30 08:54:46 -04:00
dd71ec2c93
CMake 3.6.0-rc4
2016-06-29 09:51:33 -04:00
e34c5543fa
Merge branch 'revert-try_compile-config-flags' into release
2016-06-28 15:09:44 -04:00
943fe6e3b4
Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"
...
Revert commit v3.6.0-rc1~160^2 (try_compile: Honor
CMAKE_<LANG>_FLAGS_<CONFIG> changes, 2016-04-11). The behavior it
introduced can break projects that depend on the lack of such behavior.
We will have to introduce a policy or other mechanism to enable the
behavior in a compatible way. Simply revert it for now.
See issue #16174 .
2016-06-28 15:03:45 -04:00
eb6f81705a
Merge branch 'doc-cross-reference-lang-standard-and-extensions' into release
2016-06-28 09:15:25 -04:00
c6a077d698
Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS ( #16162 )
2016-06-28 09:14:00 -04:00
76c66bf575
Merge branch 'ninja-no-rsp-for-rc' into release
2016-06-27 14:38:19 -04:00
15b3f6f0f1
ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC files
...
In commit v3.6.0-rc1~174^2 (Ninja: Honor CMAKE_NINJA_FORCE_RESPONSE_FILE
for compile rules, 2016-04-06), Ninja learned to look for
`CMAKE_NINJA_FORCE_RESPONSE_FILE` in the current scope or the
environment in order to force response file usage for all compilation
rules.
However, on Windows, the RC compiler goes through cmcldeps which does a
`replace(output, output + ".dep.obj")` on the command line. However,
with a response file (which we name `output + ".rsp"`), the response
file path is replaced instead causing the compiler to (correctly)
complain that the response file `output + ".dep.obj.rsp"` does not
exist.
What needs to happen is for cmcldeps to look through the response file,
replace *its* contents and place it in the `output + ".dep.obj.rsp"`
file.
Also add a test which actually compiles an RC file into a library and
executable for all generators on Windows and additionally test
`CMAKE_NINJA_FORCE_RESPONSE_FILE` for Ninja generators.
Fixes #16167 .
2016-06-27 14:34:06 -04:00
cd29388615
Merge branch 'FindHDF5-handle-unsuffixed' into release
2016-06-27 10:29:09 -04:00
234deec2ea
FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmake
2016-06-24 15:28:23 -04:00
963b576fd2
FindHDF5: cache the correct path to the high level libraries
2016-06-24 15:26:22 -04:00
24bad96ec0
Merge branch 'doc-osx-versions' into release
2016-06-23 13:47:08 -04:00
00caa1dde8
Help: Describe VERSION and SOVERSION meanings for Mach-O binaries
2016-06-23 13:44:26 -04:00
9f2728cef3
FindHDF5: When component targets not found fallback to compiler wrappers
2016-06-23 12:31:26 -04:00
149539d9c2
FindHDF5: Handle HDF5 builds with non-suffixed components
2016-06-23 10:57:58 -04:00
f30b0fec74
FindHDF5: correctly add lang to each component target name.
2016-06-23 10:56:29 -04:00
0acf9cb8d1
Merge branch 'backport-GetPrerequisites-typo' into release
2016-06-23 08:56:23 -04:00
460a589d20
GetPrerequisites: fix typo in comment
2016-06-22 21:38:08 +02:00
d152ae123d
CMake 3.6.0-rc3
2016-06-22 09:02:00 -04:00
c41dfdabdd
Merge branch 'doc-VS_STARTUP_PROJECT-clarify' into release
2016-06-21 09:34:47 -04:00
d3e538eabb
Help: Clarify VS_STARTUP_PROJECT documentation
...
Explain in what directory the property should be set to affect the
corresponding ``.sln`` file.
Suggested-by: Stephen Kelly <steveire@gmail.com>
2016-06-21 09:33:35 -04:00
d38fc22132
Merge branch 'update-libarchive' into release
2016-06-20 10:53:25 -04:00
52f58267c3
Merge branch 'upstream-LibArchive' into update-libarchive
...
* upstream-LibArchive:
LibArchive 2016-06-19 (139d0576)
2016-06-20 10:50:13 -04:00
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
c8f139a16b
Merge branch 'cpack-deb-test-fixes' into release
2016-06-20 09:29:22 -04:00
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
302391bae6
CPack/Deb: Fix tests for SELinux-enabled systems
...
Suggested-by: Patrick <mail6543210@yahoo.com.tw>
2016-06-20 09:29:11 -04:00
4fdb97db8d
Merge branch 'pkgconfig-targets' into release
2016-06-20 09:24:30 -04:00
45b62646db
Merge branch 'FindQt4-doc-QtDeclarative-imported' into release
2016-06-20 09:09:08 -04:00
5ed2881cb2
FindQt4: Document Qt4::QtDeclarative imported target ( #16157 )
2016-06-20 08:49:31 -04:00
8345c6463d
FindPkgConfig: define the imported targets also when the data comes from cache
2016-06-19 09:35:05 +02:00
c37e6e226c
Merge branch 'doc-issue-tracker-move' into release
2016-06-17 15:39:35 -04:00
588166f804
README: Update Issue Tracker link to new location
2016-06-17 15:38:07 -04:00
3a50c55ff6
Merge branch 'CodeBlocks-include-order' into release
2016-06-17 10:40:14 -04:00
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
4160d68189
Merge branch 'revert-vs-clang-minsize' into release
2016-06-17 10:20:16 -04:00
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
9f3546bbb4
CMake 3.6.0-rc2
2016-06-13 10:28:02 -04:00
023e2a1eb7
Merge branch 'bash-completion' into release
2016-06-10 10:47:47 -04:00
797c3c54e8
bash-completion: Add cpack --help-{manual,module,policy,property}
2016-06-10 10:46:33 -04:00
b08cae9b0e
bash-completion: Add ctest --help-{manual,module,policy,property,variable}
2016-06-10 10:46:19 -04:00
48cb388ead
bash-completion: Fix cmake --help-policy lookup
2016-06-10 10:45:25 -04:00
f67afbdc4a
bash-completion: Add cmake --help-manual
2016-06-10 09:54:29 -04:00
Konstantin Podsvirov
Brad King
O Libre
Gregor Jasny
Ben Boeckel
Robert Maynard
Bartosz Kosiorek
Rolf Eike Beer
LibArchive Upstream
Domen Vrankar
Tobias Hunger
Eric NOULARD