summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* VS: Honor preprocessor definitions in RC flagsBrad King2017-03-281-5/+7
| | | | | | | | | The VS generators use the C (or CXX) preprocessor definitions for the Windows Resource Compiler tool. This causes definitions parsed out of `CMAKE_RC_FLAGS[_<CONFIG>]` variables to be dropped. Fix the implementation to preserve both. Issue: #16745
* cmVisualStudio10TargetGenerator: De-duplicate preprocessor defsBrad King2017-03-281-1/+4
|
* cmIDEOptions: Add GetDefines methodBrad King2017-03-282-0/+7
|
* Merge branch 'cpack-rpm-correct-error-message-debug-lengths' into releaseBrad King2017-03-231-2/+2
|\
| * CPack/RPM: fix error message associated with source path lengthDaniel Black2017-03-231-2/+2
| |
* | Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-231-69/+109
|\ \
| * | 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 branch 'server-mode-fix-home-dir-check' into releaseBrad King2017-03-231-2/+22
|\ \ \
| * | | server-mode: Make CMAKE_HOME_DIRECTORY more reliableTobias Hunger2017-03-221-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Make CMAKE_HOME_DIRECTORY detection work more reliably in the face of symlinks. Closes #16736
* | | | Merge branch 'InstallRequiredSystemLibraries-refactor' into releaseBrad King2017-03-231-179/+176
|\ \ \ \ | | |/ / | |/| |
| * | | 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 branch 'avoid-MSVC-per-version-vars' into releaseBrad King2017-03-233-11/+11
|\ \ \
| * | | 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 branch 'doc-prefer-MSVC_VERSION' into releaseBrad King2017-03-2211-3/+25
|\ \ \
| * | | Help: Document preference of `MSVC_VERSION` over `MSVC##`Brad King2017-03-2210-0/+20
| | | | | | | | | | | | | | | | Issue: #16735
| * | | Help: Clarify MSVC14 docs w.r.t. VS 2017 v141 toolsetBrad King2017-03-221-2/+2
| | | | | | | | | | | | | | | | Issue: #16735
| * | | MSVC: Exclude future cl 20+ from MSVC14 variableBrad King2017-03-221-1/+3
| | | |
* | | | Merge branch 'FindwxWidgets-vs-2017' into releaseBrad King2017-03-221-5/+7
|\ \ \ \
| * | | | 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 branch 'FindBoost-1.64' into releaseBrad King2017-03-221-1/+1
|\ \ \ \
| * | | | 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 branch '16624-blas-lapack-documentation' into releaseBrad King2017-03-222-9/+35
|\ \ \ \ \
| * | | | | FindBLAS/LAPACK: Format documentationGregor Jasny2017-03-222-9/+35
| | |/ / / | |/| | | | | | | | | | | | | Closes #16624
* | | | | Merge branch 'ninja-fortran-depfile-fix' into releaseBrad King2017-03-211-1/+3
|\ \ \ \ \
| * | | | | Ninja: Fix Fortran `include` dependency on generated fileBrad King2017-03-211-1/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge branch 'backport-FindHDF5-optional-no-config' into releaseBrad King2017-03-211-2/+6
|\ \ \ \ \
| * | | | | FindHDF5: Add option to skip finding package configuration fileBrad King2017-03-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | FindHDF5: Improve HDF5_ROOT variable documentationBrad King2017-03-211-1/+2
| |/ / / /
* | | | | Merge branch 'cuda_no_ninja_response_support' into releaseBrad King2017-03-212-9/+12
|\ \ \ \ \
| * | | | | CUDA: Disable support for using response files.Robert Maynard2017-03-212-9/+12
| |/ / / /
* | | | | Merge branch 'libarchive-backport-rc4-crypto-rec' into releaseBrad King2017-03-211-1/+1
|\ \ \ \ \
| * | | | | libarchive: backport rc4 crypto requirement updateBrad King2017-03-211-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'cpack-rpm-debuginfo-multiple-files-fix' into releaseBrad King2017-03-211-2/+8
|\ \ \ \ \
| * | | | | CPack/RPM: fix cpack_rpm_debugsymbol_check parameterDomen Vrankar2017-03-211-2/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CPACK_RPM_INSTALL_FILES` must be converted into a list before it is used as parameter to `cpack_rpm_debugsymbol_check`. Fixes: #16717
* | | | | Merge branch 'FindHDF5-fix-quoting' into releaseBrad King2017-03-201-1/+1
|\ \ \ \ \
| * | | | | FindHDF5: fix quotingBen Boeckel2017-03-151-1/+1
| | | | | |
* | | | | | Merge branch 'FindBoost-1.64' into releaseBrad King2017-03-201-3/+3
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | FindBoost: Add support for 1.64Mateusz Łoskot2017-03-201-3/+3
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 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).
* | | | | Merge branch 'CSharpUtilities-doc' into releaseBrad King2017-03-201-12/+20
|\ \ \ \ \
| * | | | | CSharpUtilities: Fix documentationMichael Stürmer2017-03-201-12/+20
| |/ / / / | | | | | | | | | | | | | | | Fixes: #16711
* | | | | Merge branch 'doc-toolset-host-arch-typo' into releaseBrad King2017-03-131-1/+1
|\ \ \ \ \
generated by cgit v0.12 at 2025-03-06 09:50:21 (GMT)