Commit Graph

34748 Commits

Author SHA1 Message Date
Gregor Jasny c03141c04c Swift: Default to Swift 3.0 with Xcode 8.3 and later
Xcode 8.3 has dropped support for Swift 2.3 so that compiler and
feature detection failed.

Closes #16742
2017-03-28 16:06:29 -04:00
Brad King 1adbe223cd Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into release 2017-03-23 13:48:17 -04:00
Daniel Black 8dc23a4380 CPack/RPM: fix error message associated with source path length 2017-03-23 13:47:58 -04:00
Brad King 40cf5e0e07 Merge branch 'InstallRequiredSystemLibraries-vs2017' into release 2017-03-23 10:43:00 -04:00
Brad King d4a693a083 InstallRequiredSystemLibraries: Add support for VS 2017
VS 2017 (VS 15) places its redist DLLs in `Microsoft.VC150.*`
directories but still uses version number `140` in the DLL names.  The
redist directories now have version numbers in their name, and the MSVC
and MFC runtime DLLs may be in directories with different versions.
Fill out our logic to handle this.

For now assume we are given the `MSVC_REDIST_DIR` value as a cache
entry.  Unfortunately we cannot yet find the VS 2017 MSVC redist
directory automatically since there is no registry entry for the VS
installation.  Later we will have to use `cmVSSetupHelper` for this.

Issue: #16735
2017-03-23 10:30:14 -04:00
Brad King 5ed4e48128 InstallRequiredSystemLibraries: Split MFC redist dir variable 2017-03-23 10:26:52 -04:00
Brad King dbdb880af9 InstallRequiredSystemLibraries: Split VS IDE and DLL versions
Refactor MSVC logic to split the IDE and DLL version variables.
2017-03-23 10:14:50 -04:00
Brad King 324d7f5a50 Merge branch 'server-mode-fix-home-dir-check' into release 2017-03-23 08:42:51 -04:00
Brad King 51ef9bb1eb Merge branch 'InstallRequiredSystemLibraries-refactor' into release 2017-03-23 08:42:42 -04:00
Brad King b8c72c50f7 Merge branch 'avoid-MSVC-per-version-vars' into release 2017-03-23 08:42:37 -04:00
Brad King 9ab966a722 FindRuby: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King 69b9fde148 FindGTK2: Use MSVC_VERSION instead of MSVC## 2017-03-23 08:40:35 -04:00
Brad King 3fe3182247 FindBoost: Avoid mentioning discouraged MSVC##` variable 2017-03-23 08:40:34 -04:00
Brad King a2aad448e1 InstallRequiredSystemLibraries: Drop version from variable names
Each `MSVC${v}_*_DIR` variable is only ever used with one value for
`${v}` within a given build tree.  Drop the `${v}` version component
from the variable names.
2017-03-22 15:58:40 -04:00
Brad King 16eb58d503 InstallRequiredSystemLibraries: Refactor to avoid macros
For a given `MSVC_VERSION` our macros were each called at most once.
Replace them with a single code path that is parameterized over what
was the macro argument.
2017-03-22 15:48:34 -04:00
Brad King a259e8db8f InstallRequiredSystemLibraries: Use MSVC_VERSION instead of MSVC##
Issue: #16735
2017-03-22 12:50:10 -04:00
Tobias Hunger 8285ad511a server-mode: Make CMAKE_HOME_DIRECTORY more reliable
Make CMAKE_HOME_DIRECTORY detection work more reliably in the face
of symlinks.

Closes #16736
2017-03-22 17:31:02 +01:00
Brad King d2fb1264d7 Merge branch 'doc-prefer-MSVC_VERSION' into release 2017-03-22 11:28:31 -04:00
Brad King 4fbae41f88 Merge branch 'FindwxWidgets-vs-2017' into release 2017-03-22 11:28:25 -04:00
Brad King fecf846701 Help: Document preference of MSVC_VERSION over MSVC##
Issue: #16735
2017-03-22 11:24:54 -04:00
Brad King 712452e330 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
Issue: #16735
2017-03-22 11:24:46 -04:00
Brad King 49a60b70e7 MSVC: Exclude future cl 20+ from MSVC14 variable 2017-03-22 11:23:37 -04:00
Brad King 8f207df14d FindwxWidgets: Add support for VS 2017 v141 toolset
Issue: #16735
2017-03-22 11:08:05 -04:00
Brad King 73f7d26682 FindwxWidgets: Use MSVC_VERSION instead of MSVC## 2017-03-22 11:08:05 -04:00
Brad King 352b195f87 Merge branch 'FindBoost-1.64' into release 2017-03-22 10:50:33 -04:00
Mateusz Łoskot 9b2f8a82e5 FindBoost: Update support for 1.64
Update the Boost library name mangling used for VS 2017 to match a
change made to Boost upstream (vc1410 => vc141).
2017-03-22 10:49:17 -04:00
Brad King 5b311041f3 Merge branch '16624-blas-lapack-documentation' into release 2017-03-22 09:10:40 -04:00
Gregor Jasny ded9859c92 FindBLAS/LAPACK: Format documentation
Closes #16624
2017-03-22 09:10:28 -04:00
Brad King 849f1ec1c0 Merge branch 'ninja-fortran-depfile-fix' into release 2017-03-21 15:37:07 -04:00
Brad King 805706b36d Ninja: Fix Fortran include dependency on generated file
Work around upstream ninja issue 1251 by converting include directories
used by our Fortran dependency scanner to the same path format that we
use in preprocessor `-I` flags and in the `build.ninja` manifest.

Fixes: #16722
2017-03-21 15:19:01 -04:00
Brad King 10eb329e31 Merge branch 'backport-FindHDF5-optional-no-config' into release 2017-03-21 13:09:15 -04:00
Brad King 9753d4c27e FindHDF5: Add option to skip finding package configuration file
Some projects may not be prepared to use the imported targets defined by
the HDF5 package configuration file.  Give users a way to skip this part
of the search.

Issue: #16718
2017-03-21 13:07:07 -04:00
Brad King 2df8aa0c80 FindHDF5: Improve HDF5_ROOT variable documentation 2017-03-21 13:02:36 -04:00
Brad King 1356ef4f84 Merge branch 'cuda_no_ninja_response_support' into release 2017-03-21 11:15:49 -04:00
Brad King 47adf51f40 Merge branch 'libarchive-backport-rc4-crypto-rec' into release 2017-03-21 11:10:23 -04:00
Brad King 18009aaf5e libarchive: backport rc4 crypto requirement update
Backport upstream libarchive commit 70f497f456 (As per Cryptographic
Requirements, 2017-03-19).  Discard more bytes of the RC4 keystream
to reduce the possibility of non-random bytes.
2017-03-21 11:09:25 -04:00
Robert Maynard feaea0658c CUDA: Disable support for using response files. 2017-03-21 11:09:18 -04:00
Brad King 68115cf0ea Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into release 2017-03-21 09:09:40 -04:00
Domen Vrankar 5606622e61 CPack/RPM: fix cpack_rpm_debugsymbol_check parameter
`CPACK_RPM_INSTALL_FILES` must be converted into a list before it is
used as parameter to `cpack_rpm_debugsymbol_check`.

Fixes: #16717
2017-03-21 09:09:28 -04:00
Brad King 50856e948e Merge branch 'FindHDF5-fix-quoting' into release 2017-03-20 16:15:15 -04:00
Brad King aa21a77660 Merge branch 'FindBoost-1.64' into release 2017-03-20 14:45:39 -04:00
Mateusz Łoskot 6bd28fd235 FindBoost: Add support for 1.64
Update the module to enable finding components of Boost 1.64 (beta) from
the upcoming release.  Also update the Boost library name mangling used
for VS 2017 to match a change made to Boost upstream (vc150 => vc1410).
2017-03-20 14:43:24 -04:00
Brad King 50760540f8 Merge branch 'CSharpUtilities-doc' into release 2017-03-20 14:27:30 -04:00
Michael Stürmer 04a11f16ba CSharpUtilities: Fix documentation
Fixes: #16711
2017-03-20 14:25:50 -04:00
Ben Boeckel 8214061d1a FindHDF5: fix quoting 2017-03-15 12:54:19 -04:00
Brad King f2d250adf0 Merge branch 'doc-toolset-host-arch-typo' into release 2017-03-13 10:33:44 -04:00
Brad King 81b2454757 Help: Fix typo in CMAKE_VS_PLATFORM_TOOLSET_HOST_ARCHITECTURE 2017-03-13 10:32:50 -04:00
Brad King 4aca67b0fb Merge branch 'FindGit-avoid-vs-2017-git' into release 2017-03-10 16:13:05 -05:00
Brad King c4d481e5b8 FindGit: Avoid finding VS 2017 non-general Git installation
At a VS 2017 command prompt the `PATH` contains a directory that happens
to have a `Git/cmd/git.exe` inside it.  However, this executable is not
meant for general use.  Revise our use of `Git/` path suffixes to be
more specific to its original purpose of searching in the typical
`c:/Program Files*/Git/` installation directories.  Avoid using the
suffixes on `PATH` entries.

Fixes: #16706
2017-03-10 16:09:31 -05:00
Brad King 905f139b88 Merge branch 'doc-vs15-MSVC_VERSION' into release 2017-03-08 14:31:45 -05:00