summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2016-08-03259-7415/+11878
|\ | | | | | | | | * upstream-curl: curl 2016-08-03 (f2cb3a01)
| * curl 2016-08-03 (f2cb3a01)Curl Upstream2016-08-03259-7411/+11887
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
* | curl: Update script to get curl 7.50.1Brad King2016-08-031-1/+3
| |
* | Merge branch 'upstream-curl' into update-curlBrad King2016-08-030-0/+0
|\ \ | |/
| * curl 2015-08-11 (1a7f66a3)Curl Upstream2016-08-030-0/+0
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/bagder/curl.git at commit 1a7f66a3de2625d10f65415e6eb3e56067dc0555 (curl-7_44_0).
* | Add script to update curl from upstreamBrad King2016-08-031-0/+36
| |
* | CMake 3.6.1v3.6.1Brad King2016-07-221-1/+1
| |
* | Merge branch 'revert-autogen-subdirs' into releaseBrad King2016-07-2122-377/+45
|\ \
| * | Autogen: Revert changes to generate moc/rcc in subdirectoriesBrad King2016-07-2122-377/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert these commits: * v3.6.0-rc1~134^2 Tests: QtAutogen: Same source name in different directories test, 2016-04-13 * v3.6.0-rc1~134^2~1 Autogen: Generate qrc_NAME.cpp files in subdirectories, 2016-04-19 * v3.6.0-rc1~134^2~2 Autogen: Generate not included moc files in subdirectories, 2016-04-19 They regress existing builds that depend on the paths/symbols generated previously. Another approach will be needed to solve the name collision problem they were intended to solve. Leave the error diagnostics for the colliding cases that were added in the same topic as the above commits because they provide a useful early failure in relevant cases. Fixes #16209.
* | | Merge branch 'nsis-protect-uninst-exec' into releaseBrad King2016-07-212-1/+7
|\ \ \
| * | | NSIS: Quote uninstaller path when executing it in a shellJustin Clift2016-07-212-1/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Protect our `$0` reference in the shell as `"$0"`. Otherwise it works with a space in the path only due to an insecure Windows feature. Prior to this fix, any installer using the option added by commit v2.8.9~234^2 (Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL, 2011-06-11) exposes a local privilege escalation vulnerability. Reported-by: Amir Szekely <kichik@gmail.com> Reported-by: Ug_0 Security
* | | Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into releaseBrad King2016-07-191-1/+2
|\ \ \
| * | | CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS valueBrad King2016-07-191-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~339^2 (CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option, 2016-02-18) we now honor the "Directory" option of this variable. Prior to that commit the value was not used so projects may have used a placeholder value like `.` instead of `/`. Treat `.` the same as `/` to restore compatibility with such projects. Fixes #16205.
* | | Merge branch 'ninja-no-accidental-rsp' into releaseBrad King2016-07-151-1/+1
|\ \ \
| * | | Ninja: Do not force response files when no sysconf(3) limit is usedBrad King2016-07-151-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.6.0-rc1~174^2~1 (cmGlobalNinjaGenerator: Clarify logic for forcing use of response files, 2016-04-06) started using negative command line length values to represent forced use of response files but forgot to update `calculateCommandLineLengthLimit()` accordingly. Teach it to return `0` instead of `-1` when no limit is computed from the system to avoid forcing response files. Reported-by: Raphael Kubo da Costa <rakuco@FreeBSD.org>
* | | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-07-131-1/+2
|\ \ \
| * | | VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986)Brad King2016-07-131-1/+2
| | | |
* | | | Merge branch 'FindHDF5-fix-misc-issues' into releaseBrad King2016-07-131-37/+99
|\ \ \ \
| * | | | FindHDF5: Cleanup inconsistent use of HDF5_ROOTChuck Atkins2016-07-121-10/+14
| | | | |
| * | | | FindHDF5: Properly fail when required components are not found.Chuck Atkins2016-07-121-1/+20
| | | | |
| * | | | FindHDF5: Fix h5cc arg parsing to work with homebrew on MacChuck Atkins2016-07-121-26/+65
| | |/ / | |/| |
* | | | Merge branch 'fix-cpack-rpm-different-package-names' into releaseBrad King2016-07-111-0/+1
|\ \ \ \
| * | | | CPack/RPM: Add missed CPACK_RPM_FILE_NAME fallback variableAlex Turbov2016-07-111-0/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~66^2 (CPack/RPM different package names, 2016-05-15) we forgot the non-uppercased fallback variable name `CPACK_RPM_<COMPONENT>_FILE_NAME`. Add it now.
* | | | Merge branch 'find-command-restore-PATH-on-unix' into releaseBrad King2016-07-111-4/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Restore find_(library|file|path) search of PATH itselfBrad King2016-07-111-4/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit commit v3.6.0-rc1~82^2 (Drop find_(library|file|path) prefixes from PATH on non-Windows, 2016-05-09) aggressively dropped search of the entries in PATH itself in addition to the prefixes derived from it. This regresses find modules that (incorrectly) depended on the behavior, including some of our own modules such as FindImageMagick. Restore the search of entries in PATH itself. If we want to drop it later we will need to do so with a policy. Fixes #16192.
* | | CMake 3.6.0v3.6.0Brad King2016-07-071-1/+1
| | |
* | | Merge branch 'cpack-ifw-fix-repo-attributes' into releaseBrad King2016-07-051-2/+2
|\ \ \
| * | | CPackIFW: Fix attributes for Promoting Updates repository replacementKonstantin Podsvirov2016-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | Fix spelling of attributes added by commit v3.6.0-rc1~52^2 (CPackIFW: Add support for Promoting Updates, 2016-05-17).
* | | | Merge branch 'FindJNI-ubuntu-paths' into releaseBrad King2016-07-051-3/+4
|\ \ \ \
| * | | | FindJNI: Fix support for Ubuntu 15.10O Libre2016-07-051-3/+4
| |/ / / | | | | | | | | | | | | | | | | 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.
* | | | Merge branch 'clang-format-script' into releaseBrad King2016-06-301-4/+8
|\ \ \ \
| * | | | clang-format.bash: Fix filter-branch example documentationBrad King2016-06-301-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'doc-updates' into releaseBrad King2016-06-302-2/+18
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Help: Document CMAKE_TRY_COMPILE_PLATFORM_VARIABLES exampleBrad King2016-06-301-0/+16
| | | | | | | | | | | | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
| * | | | InstallRequiredSystemLibraries: Document UCRT option use caseBrad King2016-06-301-2/+2
|/ / / / | | | | | | | | | | | | Suggested-by: Hendrik Sattler <post@hendrik-sattler.de>
* | | | CMake 3.6.0-rc4v3.6.0-rc4Brad King2016-06-291-1/+1
| | | |
* | | | Merge branch 'revert-try_compile-config-flags' into releaseBrad King2016-06-285-34/+0
|\ \ \ \
| * | | | Revert "try_compile: Honor CMAKE_<LANG>_FLAGS_<CONFIG> changes"Brad King2016-06-285-34/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'doc-cross-reference-lang-standard-and-extensions' into releaseBrad King2016-06-284-2/+8
|\ \ \ \ \
| * | | | | Help: Cross reference CXX_STANDARD and CXX_EXTENSIONS (#16162)Gregor Jasny2016-06-284-2/+8
| |/ / / /
* | | | | Merge branch 'ninja-no-rsp-for-rc' into releaseBrad King2016-06-276-2/+28
|\ \ \ \ \
| * | | | | ninja, rc: ignore CMAKE_NINJA_FORCE_RESPONSE_FILE for RC filesBen Boeckel2016-06-276-2/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'FindHDF5-handle-unsuffixed' into releaseBrad King2016-06-271-4/+21
|\ \ \ \ \
| * | | | | FindHDF5: create all the *_LIBRARIES when using hdf5-config.cmakeRobert Maynard2016-06-241-0/+4
| | | | | |
| * | | | | FindHDF5: cache the correct path to the high level librariesRobert Maynard2016-06-241-3/+3
| | | | | |
| * | | | | FindHDF5: When component targets not found fallback to compiler wrappersRobert Maynard2016-06-231-0/+6
| | | | | |
| * | | | | FindHDF5: Handle HDF5 builds with non-suffixed componentsRobert Maynard2016-06-231-0/+7
| | | | | |
| * | | | | FindHDF5: correctly add lang to each component target name.Robert Maynard2016-06-231-1/+1
| |/ / / /
* | | | | Merge branch 'doc-osx-versions' into releaseBrad King2016-06-233-13/+43
|\ \ \ \ \
| * | | | | Help: Describe VERSION and SOVERSION meanings for Mach-O binariesBartosz Kosiorek2016-06-233-13/+43
| |/ / / /
generated by cgit v0.12 at 2025-02-15 09:01:02 (GMT)