Commit Graph

35281 Commits

Author SHA1 Message Date
Brad King
f0f60c548a Merge branch 'release' 2017-03-23 08:50:41 -04:00
Brad King
677b3cbf28 Merge topic 'server-mode-fix-home-dir-check'
8285ad51 server-mode: Make CMAKE_HOME_DIRECTORY more reliable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !611
2017-03-23 08:46:30 -04:00
Brad King
f673623130 Merge topic 'InstallRequiredSystemLibraries-refactor'
a2aad448 InstallRequiredSystemLibraries: Drop version from variable names
16eb58d5 InstallRequiredSystemLibraries: Refactor to avoid macros
a259e8db InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !612
2017-03-23 08:46:04 -04:00
Brad King
cfa55fd428 Merge topic 'doc-prefer-MSVC_VERSION'
fecf8467 Help: Document preference of `MSVC_VERSION` over `MSVC##`
712452e3 Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolset
49a60b70 MSVC: Exclude future cl 20+ from MSVC14 variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !609
2017-03-23 08:44:58 -04:00
Brad King
a1440504ff Merge topic 'avoid-MSVC-per-version-vars'
9ab966a7 FindRuby: Use `MSVC_VERSION` instead of `MSVC##`
69b9fde1 FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`
3fe31822 FindBoost: Avoid mentioning discouraged `MSVC##`` variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !610
2017-03-23 08:44:22 -04:00
Brad King
e978a2e5b1 Merge topic 'FindwxWidgets-vs-2017'
8f207df1 FindwxWidgets: Add support for VS 2017 v141 toolset
73f7d266 FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !608
2017-03-23 08:44:05 -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
922b7770bd Merge topic 'cpack_nsis_sign_uninstaller'
e1ee7b43 CPack/NSIS: Avoid a race condition when generating the installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !605
2017-03-23 08:29:49 -04:00
Kitware Robot
82db83d2f1 CMake Nightly Date Stamp 2017-03-23 00:01:06 -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
9a733c7bd6 Merge branch 'release' 2017-03-22 10:54:20 -04:00
Brad King
88d32ef095 Merge topic 'FindBoost-1.64'
9b2f8a82 FindBoost: Update support for 1.64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !607
2017-03-22 10:52:45 -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
da802afd6e Merge topic 'doc-dev-do-reformat'
72f534ca Help/dev: Document `Do: reformat` action
2192247e Help/dev: Make `Do: check` cross-reference more specific

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !606
2017-03-22 10:06:00 -04:00
Brad King
72f534ca15 Help/dev: Document Do: reformat action 2017-03-22 09:47:30 -04:00
Brad King
2192247e33 Help/dev: Make Do: check cross-reference more specific
Add a dedicated subsection header for its documentation.
2017-03-22 09:41:53 -04:00
Brad King
5d2f30f5ac Merge topic '14335-duplicate-else'
edac95b9 cmIfCommand: Reject duplicate else() and misplaced elseif()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !594
2017-03-22 09:24:49 -04:00
Brad King
e24ed7ad87 Merge branch 'release' 2017-03-22 09:12:17 -04:00
Brad King
6ce7e58737 Merge topic '16624-blas-lapack-documentation'
ded9859c FindBLAS/LAPACK: Format documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !603
2017-03-22 09:11:31 -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
84a96aa0a5 Merge branch 'release' 2017-03-22 08:56:11 -04:00
Brad King
10cbb87fa3 Merge topic 'ninja-fortran-depfile-fix'
805706b3 Ninja: Fix Fortran `include` dependency on generated file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !601
2017-03-22 08:52:18 -04:00
Brad King
56c39d8836 Merge topic 'add-CheckIPOSupported-module'
6c832674 Tests for 'CheckIPOSupported' module
fdb2ba25 CheckIPOSupported: New module to check for compiler/cmake IPO support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !558
2017-03-22 08:51:59 -04:00
Brad King
53e2ef1bb4 Merge topic 'FindHDF5-optional-no-config'
2c55c143 Merge branch 'backport-FindHDF5-optional-no-config' into FindHDF5-optional-no-config
63c0ba5f FindHDF5: Improve HDF5_ROOT and HDF5_FIND_DEBUG documentation
9753d4c2 FindHDF5: Add option to skip finding package configuration file
2df8aa0c FindHDF5: Improve HDF5_ROOT variable documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !599
2017-03-22 08:50:31 -04:00
Brad King
b5d8a6de48 Merge topic 'cuda_no_ninja_response_support'
feaea065 CUDA: Disable support for using response files.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !596
2017-03-22 08:50:05 -04:00
Brad King
59032a3847 Merge topic 'libarchive-backport-rc4-crypto-rec'
18009aaf libarchive: backport rc4 crypto requirement update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !598
2017-03-22 08:49:35 -04:00
Brad King
989484d51f Merge topic 'module-def-and-WINDOWS_EXPORT_ALL_SYMBOLS'
075f6454 Support WINDOWS_EXPORT_ALL_SYMBOLS with `.def` files
21c4ec4f cmGlobalVisualStudioGenerator: Simplify __create_def command generation
24361a45 bindexplib: Add support for parsing and integrating `.def` files
845c4824 bindexplib: Add method for parsing and integrating `.def` files
4f90e793 bindexplib: Revise coding style of CMake-specific methods

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !581
2017-03-22 08:49:09 -04:00
Brad King
053317480a Merge topic 'cpack-rpm-debuginfo-multiple-files-fix'
5606622e CPack/RPM: fix cpack_rpm_debugsymbol_check parameter

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !595
2017-03-22 08:48:45 -04:00
Gregor Jasny
edac95b955 cmIfCommand: Reject duplicate else() and misplaced elseif()
Closes: #14335
2017-03-22 08:42:35 -04:00
Roman Wüger
e1ee7b4305 CPack/NSIS: Avoid a race condition when generating the installer 2017-03-22 13:15:24 +01:00
Brad King
7ebbe4f9d8 Merge topic 'doc-dev-topic-rename'
5fe36306 Help/dev: Document `Topic-rename:` description trailer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !602
2017-03-22 08:08:30 -04:00
Kitware Robot
564add478d CMake Nightly Date Stamp 2017-03-22 00:01:04 -04:00
Brad King
5fe3630677 Help/dev: Document Topic-rename: description trailer 2017-03-21 15:46:32 -04:00