summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-09-011-1/+3
|\
| * VS: Fix VS 2015 .vcxproj debug setting for v80 toolsetBrad King2016-09-011-1/+3
| | | | | | | | Closes: #16281
* | Merge branch 'vs-NsightTegra-empty-version' into releaseBrad King2016-08-261-5/+4
|\ \
| * | VS: Fix out-of-bounds write on empty Nsight Tegra versionFujii Hironori2016-08-261-5/+4
| | | | | | | | | | | | | | | | | | In cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator, wrote 0 to this->NsightTegraVersion[-1] if sscanf returns -1 which is the case of GetNsightTegraVersion is empty.
* | | Merge branch 'intel-fortran-mod-diff' into releaseBrad King2016-08-241-0/+6
|\ \ \
| * | | Fortran: Fix .mod file comparison for Intel 16 formatBrad King2016-08-241-0/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Intel 16 format starts with the 0x0A 0x00 sequence that we use to skip past the timestamp. This occurrence appears to be a version number. Skip the first byte to avoid matching the sequence early. Ideally we should gain a better understanding of the format and avoid depending on short sequences that are likely to appear early by coincidence, but this approach will suffice for now. Closes: #16263
* | | Merge branch 'GetPrerequisites-fix-regression' into releaseBrad King2016-08-121-2/+6
|\ \ \
| * | | GetPrerequisites: Fix regression in gp_resolved_file_typeBrad King2016-08-121-2/+6
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.6.0-rc1~287^2 (GetPrerequisites: Fix gp_resolved_file_type on non-canonical paths, 2016-03-08) we accidentally convert relative paths (e.g. system dll file names) to absolute paths even when we do not know the base directory. Fix this by canonicalizing only paths that are already absolute. Closes: #16240
* | | Merge branch 'update-cle-version-info' into releaseBrad King2016-08-082-4/+14
|\ \ \
| * | | CrayLinuxEnvironment: Add alternative methods to get version infoChuck Atkins2016-08-052-4/+14
| |/ / | | | | | | | | | Closes: #16229
* | | Merge branch 'vs14-debug-enum-older-toolsets' into releaseBrad King2016-08-051-4/+7
|\ \ \ | | |/ | |/|
| * | VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolsetBrad King2016-08-051-4/+7
| | | | | | | | | | | | Closes: #16213
* | | Merge branch 'update-curl' into releaseBrad King2016-08-03261-7481/+11916
|\ \ \
| * | | curl: Remove CMake-specific READMEBrad King2016-08-031-66/+0
| | | | | | | | | | | | | | | | | | | | | | | | We will now manage the curl source tree updates using the `Utilities/Scripts/update-curl.bash` script. Drop the README that covered the old method.
| * | | 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
| | |_|/ | |/| |
* | | | Merge branch 'intel-gnu11-support' into releaseBrad King2016-08-031-4/+4
|\ \ \ \
| * | | | Intel-C: standard flags are also supported in 12.0Ben Boeckel2016-08-021-1/+1
| | | | |
| * | | | Intel-C: support gnu89 and gnu99 extension flagsBen Boeckel2016-08-021-2/+2
| | | | |
| * | | | Intel-C: declare support for gnu11Ben Boeckel2016-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without extensions, functions like `strdup` are not available since they are actually controlled by feature flags such as _SVID_SOURCE and _BSD_SOURCE. When using `-std=c11` on Intel, none of these flags are set, so the functions are not declared properly leading to compile errors. Reported-by: Adam J. Stewart <ajstewart426@gmail.com> Closes: #16226
* | | | | Merge branch 'fix-findhdf5-definitions' into releaseBrad King2016-08-021-1/+1
|\ \ \ \ \
| * | | | | FindHDF5: Make sure compile definition vars keep the -D flagChuck Atkins2016-08-021-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into releaseBrad King2016-08-021-0/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRSKonstantin Sinitsyn2016-08-021-0/+8
|/ / / / | | | | | | | | | | | | | | | | | | | | Support was accidentally dropped by commit v3.6.0-rc1~273^2 (FindProtobuf: Rename variables to match case of module name, 2016-03-01).
* | | | 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).
generated by cgit v0.12 at 2025-09-15 11:17:01 (GMT)