summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-rc-defines'Brad King2017-03-292-1/+19
|\ | | | | | | | | | | | | | | | | | | | | fff34934 MSVC: Restore _DEBUG preprocessor definition in RC debug builds 79a91538 RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache c77194ec VS: Honor preprocessor definitions in RC flags 1449f6f6 cmVisualStudio10TargetGenerator: De-duplicate preprocessor defs 8a619e8c cmIDEOptions: Add GetDefines method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !640
| * MSVC: Restore _DEBUG preprocessor definition in RC debug buildsBrad King2017-03-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.8.0-rc1~304^2 (MSVC: Do not define _DEBUG explicitly when using /MDd, 2016-11-15) we removed the `_DEBUG` preprocessor definition from MSVC C and C++ flags because the `cl` compiler automatically defines it in Debug builds anyway. However, the VS generators propagate C preprocessor definitions to the RC (Windows Resource Compiler) tool. This means that we used to explicitly define `_DEBUG` for RC debug builds. Therefore existing project code may expect the definition to be there even though the `rc` compiler itself does not implicitly define `_DEBUG` in debug builds. Add the `_DEBUG` flag to the default `CMAKE_RC_FLAGS_DEBUG` instead to restore this definition for RC debug builds. This also makes it available consistently in VS, Ninja, and Makefile generators. Fixes: #16745
| * RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cacheBrad King2017-03-281-1/+16
| |
* | Merge topic 'InstallRequiredSystemLibraries-vs2017'Brad King2017-03-281-7/+19
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | InstallRequiredSystemLibraries: Find VS 2017 redist directoryBrad King2017-03-271-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | InstallRequiredSystemLibraries: Split VS 2017 search pathsBrad King2017-03-271-7/+14
| | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'cpack-rpm-debuginfo-honor-package-filename'Brad King2017-03-271-2/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack/RPM: support for debuginfo package renamingDomen Vrankar2017-03-251-0/+40
| | | |
| * | | CPack/RPM honor package file name on debuginfo enabledDomen Vrankar2017-03-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Packages with debuginfo enabled should still honor defined package file name if file name is not set to RPM-DEFAULT. Fixes #16715
* | | | Merge topic 'cpack-rpm-debuginfo-docs-cleanup'Brad King2017-03-271-8/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e0fc685 CPack/RPM can now generate a single debuginfo package Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !630
| * | | | CPack/RPM can now generate a single debuginfo packageDomen Vrankar2017-03-271-8/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | CMake 3.8 introduced possibility of generating a single debuginfo package even if component packaging is enabled so this note no longer applies.
| * | | Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into releaseBrad King2017-03-231-2/+2
| |\ \ \
| * \ \ \ Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-231-69/+109
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'InstallRequiredSystemLibraries-refactor' into releaseBrad King2017-03-231-179/+176
| |\ \ \ \
| * \ \ \ \ Merge branch 'avoid-MSVC-per-version-vars' into releaseBrad King2017-03-233-11/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'doc-prefer-MSVC_VERSION' into releaseBrad King2017-03-221-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindwxWidgets-vs-2017' into releaseBrad King2017-03-221-5/+7
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindBoost-1.64' into releaseBrad King2017-03-221-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch '16624-blas-lapack-documentation' into releaseBrad King2017-03-222-9/+35
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-FindHDF5-optional-no-config' into releaseBrad King2017-03-211-2/+6
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into releaseBrad King2017-03-211-2/+8
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindHDF5-fix-quoting' into releaseBrad King2017-03-201-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindBoost-1.64' into releaseBrad King2017-03-201-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'CSharpUtilities-doc' into releaseBrad King2017-03-201-12/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindGit-avoid-vs-2017-git' into releaseBrad King2017-03-101-1/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'FindVulkan-fix-win-32' into releaseBrad King2017-03-061-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'cpack-rpm-correct-error-message-debug-lengths'Brad King2017-03-241-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | CPack/RPM: fix error message associated with source path lengthDaniel Black2017-03-231-2/+2
| | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-vs2017'Brad King2017-03-241-69/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | / | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Add support for VS 2017Brad King2017-03-231-5/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Split MFC redist dir variableBrad King2017-03-231-3/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Split VS IDE and DLL versionsBrad King2017-03-231-66/+86
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor MSVC logic to split the IDE and DLL version variables.
* | | | | | | | | | | | | | | | Merge topic 'InstallRequiredSystemLibraries-refactor'Brad King2017-03-231-179/+176
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Drop version from variable namesBrad King2017-03-221-122/+123
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Refactor to avoid macrosBrad King2017-03-221-58/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | InstallRequiredSystemLibraries: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-221-22/+22
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16735
* | | | | | | | | | | | | | | Merge topic 'doc-prefer-MSVC_VERSION'Brad King2017-03-231-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | MSVC: Exclude future cl 20+ from MSVC14 variableBrad King2017-03-221-1/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge topic 'avoid-MSVC-per-version-vars'Brad King2017-03-233-11/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | FindRuby: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-231-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | FindGTK2: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-231-5/+5
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | FindBoost: Avoid mentioning discouraged `MSVC##`` variableBrad King2017-03-231-1/+1
| |/ / / / / / / / / / / /
* | | | | | | | | | | | | Merge topic 'FindwxWidgets-vs-2017'Brad King2017-03-231-5/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | FindwxWidgets: Add support for VS 2017 v141 toolsetBrad King2017-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #16735
| * | | | | | | | | | | | FindwxWidgets: Use `MSVC_VERSION` instead of `MSVC##`Brad King2017-03-221-5/+5
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'cpack_nsis_sign_uninstaller'Brad King2017-03-231-7/+8
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e1ee7b43 CPack/NSIS: Avoid a race condition when generating the installer Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !605
| * | | | | | | | | | | | CPack/NSIS: Avoid a race condition when generating the installerRoman Wüger2017-03-221-7/+8
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'FindBoost-1.64'Brad King2017-03-221-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b2f8a82 FindBoost: Update support for 1.64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !607
| * | | | | | | | | | | | FindBoost: Update support for 1.64Mateusz Łoskot2017-03-221-1/+1
| | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the Boost library name mangling used for VS 2017 to match a change made to Boost upstream (vc1410 => vc141).
* | | | | | | | | | | | Merge topic '16624-blas-lapack-documentation'Brad King2017-03-222-9/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ded9859c FindBLAS/LAPACK: Format documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !603
generated by cgit v0.12 at 2025-01-28 03:50:39 (GMT)