mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-27 17:10:43 -06:00
Code Issues Packages Projects Releases Wiki Activity
35,347 Commits 2 Branches 390 Tags
862482df274121e6f80dca925fb01d996710ed5e
Commit Graph

7368 Commits

Author SHA1 Message Date
Roger Leigh
862482df27 FindBoost: Support prebuilt Windows binaries from SourceForge 
This are searched for in the default installed location
C:/local/boost_${ver}
 2017-03-29 11:27:43 +01:00
Roger Leigh
3ca6f70f8b FindBoost: Allow testing for multiple compiler suffixes 
This is to permit VS2017 to make use of the vc141 suffix or
fall back to the compatible vc140 to use Boost libraries built
with VS2015.

Fixes: #16631
 2017-03-29 11:27:43 +01:00
Brad King
83199f8daf Merge topic 'InstallRequiredSystemLibraries-vs2017' 
6eb609fd InstallRequiredSystemLibraries: Find VS 2017 redist directory
cf784d9f Add undocumented CMake language means to find VS 2017
082c0375 InstallRequiredSystemLibraries: Split VS 2017 search paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !632
 2017-03-28 10:14:59 -04:00
Brad King
6eb609fd59 InstallRequiredSystemLibraries: Find VS 2017 redist directory 
Use our undocumented `cmake_host_system_information` query to find the
VS 2017 installation directory by asking the VS installer tool.  Then
look relative to that for the redist directory.

Fixes: #16737
 2017-03-27 11:43:01 -04:00
Brad King
082c0375d9 InstallRequiredSystemLibraries: Split VS 2017 search paths 
VS 2017 does not have the same registry entries or other paths we
search for other VS versions.  Split the search code paths to treat
it separately.
 2017-03-27 11:43:01 -04:00
Brad King
89e2c92f54 Merge topic 'cpack-rpm-debuginfo-honor-package-filename' 
f237f5f8 CPack/RPM: support for debuginfo package renaming
6c09c5d6 CPack/RPM honor package file name on debuginfo enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !620
 2017-03-27 09:13:31 -04:00
Brad King
ba3798555d Merge topic 'cpack-rpm-debuginfo-docs-cleanup' 
1e0fc685 CPack/RPM can now generate a single debuginfo package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !630
 2017-03-27 09:02:41 -04:00
Domen Vrankar
1e0fc68501 CPack/RPM can now generate a single debuginfo package 
CMake 3.8 introduced possibility of
generating a single debuginfo package
even if component packaging is enabled
so this note no longer applies.
 2017-03-27 08:57:33 -04:00
Domen Vrankar
f237f5f851 CPack/RPM: support for debuginfo package renaming 2017-03-25 15:25:55 +01:00
Domen Vrankar
6c09c5d64c CPack/RPM honor package file name on debuginfo enabled 
Packages with debuginfo enabled should
still honor defined package file name
if file name is not set to RPM-DEFAULT.

Fixes #16715
 2017-03-24 19:52:02 +01:00
Brad King
8b25d8e23c Merge topic 'cpack-rpm-correct-error-message-debug-lengths' 
8dc23a43 CPack/RPM: fix error message associated with source path length

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Domen Vrankar <domen.vrankar@gmail.com>
Merge-request: !614
 2017-03-24 08:23:15 -04:00
Brad King
1898f7c7d3 Merge topic 'InstallRequiredSystemLibraries-vs2017' 
d4a693a0 InstallRequiredSystemLibraries: Add support for VS 2017
5ed4e481 InstallRequiredSystemLibraries: Split MFC redist dir variable
dbdb880a InstallRequiredSystemLibraries: Split VS IDE and DLL versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !616
 2017-03-24 08:21:57 -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
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
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
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
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
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
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
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
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
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
Roman Wüger
e1ee7b4305 CPack/NSIS: Avoid a race condition when generating the installer 2017-03-22 13:15:24 +01:00
Brad King
2c55c143c8 Merge branch 'backport-FindHDF5-optional-no-config' into FindHDF5-optional-no-config 2017-03-21 13:12:16 -04:00
Brad King
63c0ba5ff1 FindHDF5: Improve HDF5_ROOT and HDF5_FIND_DEBUG documentation 2017-03-21 13:11:36 -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