31855 Commits

Author SHA1 Message Date
Brad King
eb1524869c Merge branch 'qtdialog-lib-paths' into release 2016-09-23 08:11:13 -04:00
Clinton Stimpson
48624b3cb8 cmake-gui: Do not remove library paths for Qt5 plugins.
Not removing library paths is necessary for QFileDialog to function correctly
on Linux when using Qt5.
2016-09-22 13:19:04 -06:00
Brad King
c5dcd31e92 CMake 3.6.2 2016-09-07 08:55:56 -04:00
Brad King
983371a6eb Merge branch 'backport-curl-fix' into release 2016-09-07 08:54:20 -04:00
Brad King
4b53a693bd curl: Backport certificate reuse fix from 7.50.2
Backport curl upstream commit curl-7_50_2~32 (nss: refuse previously
loaded certificate from file, 2016-08-22).
2016-09-07 08:46:42 -04:00
Brad King
0fd54137ae Merge branch 'FindHDF5-fix-hl-fortran' into release 2016-09-02 15:18:38 -04:00
Brad King
befe8648a3 FindHDF5: Fix regression in finding hdf5hl_fortran
Refactoring in commit v3.6.0-rc1~72^2 (HDF5: Rework component searching
to correctly find HL for all bindings, 2016-05-12) accidentally dropped
the name `hdf5hl_fortran` from the list of library names and replaced it
with `hdf5_hl_fortran`.  IIUC the latter name is when HDF5 is built with
CMake and the former name is for other build systems.  Since this is the
non-CMake code path, user the former name.

Closes: #16233
2016-09-02 15:09:47 -04:00
Brad King
b4d996c305 Merge branch 'FindHDF5-is-parallel' into release 2016-09-02 15:08:28 -04:00
Brad King
b61eab249f FindHDF5: Fix regression in providing HDF5_IS_PARALLEL
Since commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler
wrappers, 2016-04-01) we have additional code paths that find HDF5 and
suppress the original search logic.  Report HDF5_IS_PARALLEL from these
other code paths too.

Closes: #16257
2016-09-02 15:06:52 -04:00
Brad King
f9fc8f83d0 Merge branch 'vs14-debug-enum-older-toolsets' into release 2016-09-01 14:53:27 -04:00
Brad King
9998774f22 VS: Fix VS 2015 .vcxproj debug setting for v80 toolset
Closes: #16281
2016-09-01 14:50:04 -04:00
Brad King
c8c58947f2 Merge branch 'vs-NsightTegra-empty-version' into release 2016-08-26 10:03:37 -04:00
Fujii Hironori
1f4aeb1739 VS: Fix out-of-bounds write on empty Nsight Tegra version
In cmVisualStudio10TargetGenerator::cmVisualStudio10TargetGenerator,
wrote 0 to this->NsightTegraVersion[-1] if sscanf returns -1 which is
the case of GetNsightTegraVersion is empty.
2016-08-26 10:01:39 -04:00
Brad King
83fd4a7039 Merge branch 'intel-fortran-mod-diff' into release 2016-08-24 11:58:58 -04:00
Brad King
f699323ade Fortran: Fix .mod file comparison for Intel 16 format
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
2016-08-24 11:55:29 -04:00
Brad King
fc552ce1c7 Merge branch 'GetPrerequisites-fix-regression' into release 2016-08-12 10:29:12 -04:00
Brad King
a2d5c25a7a GetPrerequisites: Fix regression in gp_resolved_file_type
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
2016-08-12 10:24:48 -04:00
Brad King
7da3df3fb6 Merge branch 'update-cle-version-info' into release 2016-08-08 09:55:42 -04:00
Brad King
054275c6d6 Merge branch 'vs14-debug-enum-older-toolsets' into release 2016-08-05 15:21:48 -04:00
Brad King
926886a41c VS: Fix VS 2015 .vcxproj debug setting for Windows7.1SDK toolset
Closes: #16213
2016-08-05 15:21:23 -04:00
Chuck Atkins
e52302d6cb CrayLinuxEnvironment: Add alternative methods to get version info
Closes: #16229
2016-08-05 09:01:43 -04:00
Brad King
5bcbc3857f Merge branch 'update-curl' into release 2016-08-03 15:08:56 -04:00
Brad King
f59ab43370 curl: Remove CMake-specific README
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.
2016-08-03 14:31:05 -04:00
Brad King
f53f4a8a2d Merge branch 'upstream-curl' into update-curl
* upstream-curl:
  curl 2016-08-03 (f2cb3a01)
2016-08-03 14:26:53 -04:00
Curl Upstream
202adcfe05 curl 2016-08-03 (f2cb3a01)
Code extracted from:

    https://github.com/bagder/curl.git

at commit f2cb3a01192d36395d16acec6cdb93446ca6fd45 (curl-7_50_1).
2016-08-03 14:26:29 -04:00
Brad King
e1c11352f2 curl: Update script to get curl 7.50.1 2016-08-03 14:26:02 -04:00
Brad King
a51c6c5394 Merge branch 'upstream-curl' into update-curl 2016-08-03 11:54:18 -04:00
Curl Upstream
7ec709d3d7 curl 2015-08-11 (1a7f66a3)
Code extracted from:

    https://github.com/bagder/curl.git

at commit 1a7f66a3de2625d10f65415e6eb3e56067dc0555 (curl-7_44_0).
2016-08-03 11:52:06 -04:00
Brad King
3e9b03439f Add script to update curl from upstream 2016-08-03 11:51:27 -04:00
Brad King
236050153c Merge branch 'intel-gnu11-support' into release 2016-08-03 09:16:49 -04:00
Ben Boeckel
088f14eb72 Intel-C: standard flags are also supported in 12.0 2016-08-02 13:10:56 -04:00
Ben Boeckel
27a3ca15e5 Intel-C: support gnu89 and gnu99 extension flags 2016-08-02 13:10:41 -04:00
Ben Boeckel
cc223e1eed Intel-C: declare support for gnu11
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
2016-08-02 11:42:45 -04:00
Brad King
88f4b4c9e0 Merge branch 'fix-findhdf5-definitions' into release 2016-08-02 10:54:03 -04:00
Brad King
3c57905dcf Merge branch 'FindProtobuf-restore-PROTOBUF_IMPORT_DIRS' into release 2016-08-02 10:52:36 -04:00
Konstantin Sinitsyn
5790d9b6f5 FindProtobuf: Restore support for PROTOBUF_IMPORT_DIRS
Support was accidentally dropped by commit v3.6.0-rc1~273^2
(FindProtobuf: Rename variables to match case of module name,
2016-03-01).
2016-08-02 10:50:24 -04:00
Chuck Atkins
8eb0b56c2a FindHDF5: Make sure compile definition vars keep the -D flag 2016-08-02 10:34:51 -04:00
Brad King
f59513140b CMake 3.6.1 2016-07-22 09:26:11 -04:00
Brad King
f19aca6063 Merge branch 'revert-autogen-subdirs' into release 2016-07-21 10:08:40 -04:00
Brad King
40d5375cf1 Merge branch 'nsis-protect-uninst-exec' into release 2016-07-21 10:08:33 -04:00
Justin Clift
11768733d3 NSIS: Quote uninstaller path when executing it in a shell
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
2016-07-21 10:05:46 -04:00
Brad King
5e55d87bdc Autogen: Revert changes to generate moc/rcc in subdirectories
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.
2016-07-21 09:27:19 -04:00
Brad King
30dda6724f Merge branch 'compat-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into release 2016-07-19 10:09:35 -04:00
Brad King
57534990d8 CPack: Add compatibility for incorrect CPACK_INSTALL_CMAKE_PROJECTS value
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.
2016-07-19 10:07:12 -04:00
Brad King
ace12c9c15 Merge branch 'ninja-no-accidental-rsp' into release 2016-07-15 09:48:32 -04:00
Brad King
86dd2427bc Ninja: Do not force response files when no sysconf(3) limit is used
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>
2016-07-15 09:43:02 -04:00
Brad King
8ab1989e93 Merge branch 'vs14-debug-enum-older-toolsets' into release 2016-07-13 09:37:03 -04:00
Brad King
36fc3a5372 VS: Fix VS 2015 .vcxproj debug setting for v90 toolset (#15986) 2016-07-13 09:35:39 -04:00
Brad King
9c9ac043b4 Merge branch 'FindHDF5-fix-misc-issues' into release 2016-07-13 08:57:16 -04:00
Chuck Atkins
d5e4516ec2 FindHDF5: Cleanup inconsistent use of HDF5_ROOT 2016-07-12 15:32:10 -04:00