Commit Graph

7343 Commits

Author SHA1 Message Date
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
Daniel Black 8dc23a4380 CPack/RPM: fix error message associated with source path length 2017-03-23 13:47:58 -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 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 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
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
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 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 48dc2d122d Merge topic 'CPackComponent-use-cmake_parse_arguments'
2e900f1e CPackComponent: use cmake_parse_arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !588
2017-03-21 10:24:23 -04:00
Brad King 0e8b83a1b7 Merge topic 'FindHDF5-fix-quoting'
8214061d FindHDF5: fix quoting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !587
2017-03-21 09:58:18 -04:00
Brad King 5c6feab206 Merge topic 'FindBoost-1.64'
6bd28fd2 FindBoost: Add support for 1.64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !590
2017-03-21 09:55:18 -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
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 3be5896e01 Merge topic 'CSharpUtilities-doc'
04a11f16 CSharpUtilities: Fix documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !585
2017-03-20 14:28:43 -04:00
Michael Stürmer 04a11f16ba CSharpUtilities: Fix documentation
Fixes: #16711
2017-03-20 14:25:50 -04:00
Brad King 09f85c98c0 Merge topic 'move-platform-specific-paths'
0b668e52 Cygwin: Move Cygwin-specific paths to the cygwin platform
2a8c2af4 SunOS: Move solaris-specific paths to the solaris platform
7eb1f5b7 Unix: Consolidate path components into prefixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !589
2017-03-20 11:52:21 -04:00
Brad King 01bdc2cc43 Merge topic 'geh-visibility-flag'
9eb05b48 GenerateExportHeader: always fill in _EXPORT macros

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !36
2017-03-20 11:52:06 -04:00
Ben Boeckel 9eb05b48cd GenerateExportHeader: always fill in _EXPORT macros
The `_EXPORT` and `_NO_EXPORT` macros should always be made properly
because the `<LANG>_VISIBILITY_PRESET` properties are controlled
independently of this module.

One case where this breaks compatibility is where a project was setting
`USE_COMPILER_HIDDEN_VISIBILITY=OFF` and then marking a symbol used
outside of the library with `_NO_EXPORT` which is a contridiction.
2017-03-16 15:11:03 -04:00
Chuck Atkins 0b668e52a9 Cygwin: Move Cygwin-specific paths to the cygwin platform 2017-03-16 06:04:29 -04:00
Chuck Atkins 2a8c2af4d4 SunOS: Move solaris-specific paths to the solaris platform 2017-03-16 06:00:49 -04:00
Chuck Atkins 7eb1f5b7ac Unix: Consolidate path components into prefixes 2017-03-16 05:57:58 -04:00
Daniel Pfeifer 2e900f1ec5 CPackComponent: use cmake_parse_arguments 2017-03-15 18:10:33 +01:00
Ben Boeckel 8214061d1a FindHDF5: fix quoting 2017-03-15 12:54:19 -04:00
Domen Vrankar 598400a3e7 CPack/RPM: handle extra slashes
Extra slashes in some locations can
cause errors during package generation
and can also be present in generated
rpm packages causing issues for the
package user.

Closes #16619
2017-03-13 23:22:55 +01:00
Brad King 3806e186d1 Merge topic 'BundleUtilities-elf-rpath'
10fcef02 BundleUtilities: Fix bundle verification on Unix by considering rpaths.
ac0786cb BundleUtilities: Teach `get_item_rpaths` to parse ELF binaries
a52faa1f file: Add READ_ELF command to parse ELF binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !551
2017-03-13 08:59:59 -04:00
Brad King b46fa35824 Merge topic 'cuda-vs'
65481a60 CUDA: Work around VS limitation in CudaOnly.WithDefs test
8cae24a1 VS: Add more CUDA flag table entries
6ca4f222 VS: Add support for the CUDA_SEPARABLE_COMPILATION property
94255511 VS: Select CUDA code generation architectures
253594d0 VS: Select the CUDA runtime library
4def02a3 VS: Place CUDA host compiler options in proper project file fields
29f07b08 VS: Do not pass CUDA compile options to C compiler
b966f489 VS: Do not use absolute paths to CUDA sources
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !566
2017-03-13 08:57:57 -04:00