summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmFileCommand: Fix build on mingw-w64Aleksey Chernov2017-05-151-0/+4
| | | | Include header needed for `CP_ACP`.
* bootstrap: fix build on mingw-w64Aleksey Chernov2017-05-151-0/+1
| | | | Define the default code page for EncodingCXX too.
* CMake 3.8.1v3.8.1Brad King2017-05-021-1/+1
|
* Merge branch 'FindMatlab-2017a' into releaseBrad King2017-05-011-0/+1
|\
| * FindMatlab: Add support for Matlab 2017aRaffi Enficiaud2017-05-011-0/+1
| |
* | Merge branch 'vs2017-sdk-detection' into releaseBrad King2017-04-251-1/+1
|\ \
| * | VS2017: Verify Windows 8.1 SDK before using itRoger Leigh2017-04-251-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The detection logic added by commit v3.8.0-rc2~14^2 (VS2017: If Win 8.1 SDK is not available, use Win 10 SDK, 2017-02-20) was incomplete. It is possible for the Win 8.1 SDK registry entry to exist, and even the directory, but the header files to not actually be installed. Teach `cmGlobalVisualStudio15Generator::IsWin81SDKInstalled` to verify that the `windows.h` header actually exists in the SDK directory. We do this in `cmGlobalVisualStudio14Generator::GetWindows10SDKVersion` for the Windows 10 SDK already. Fixes: #16811
* | Merge branch 'FindBoost-backport-fixes' into releaseBrad King2017-04-241-14/+42
|\ \
| * | FindBoost: Support prebuilt Windows binaries from SourceForgeRoger Leigh2017-04-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | This are searched for in the default installed location C:/local/boost_${ver} Cherry picked from commit 862482df274121e6f80dca925fb01d996710ed5e for backport to CMake 3.8.
| * | FindBoost: Allow testing for multiple compiler suffixesRoger Leigh2017-04-241-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Cherry picked from commit 3ca6f70f8b27c08ad3470542705701e6e8e6ea05 plus a fixup from commit 6115875bf0faef61c558e46395e67bdfd4ad48e1 for backport to CMake 3.8.
| * | FindBoost: Fix library directory for VS 2017Brad King2017-04-241-1/+1
| | | | | | | | | | | | Boost 1.64 now names the library directory `14.1`, not `15.0`.
* | | Merge branch 'backport-source_group-TREE-alt-root' into releaseBrad King2017-04-211-16/+44
|\ \ \
| * | | source_group: Fix TREE with root that is not current source dirMateusz Janek2017-04-211-16/+44
| | |/ | |/| | | | | | | | | | | | | Also raise an error if files are given that are not below the root. Fixes: #16807
* | | Merge branch 'fix-test-all-find-modules' into releaseBrad King2017-04-212-6/+2
|\ \ \
| * | | Tests: Simplify CMakeOnly.AllFindModules policy settingsBrad King2017-04-211-5/+1
| | | |
| * | | Tests: Fix FindModulesExecuteAll when KDE4 is installedBrad King2017-04-211-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Set `CMP0017` to `NEW` so that when FindKDE4 sets `CMAKE_MODULE_PATH` it does not break internal dependencies of other find modules. Fixes: #16823
* | | Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
|\ \ \
| * | | CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docsDomen Vrankar2017-04-201-0/+13
| |/ / | | | | | | | | | | | | | | | | | | Missing documentation for an already existing CPackRPM source rpm packages feature. Fixes #16814
* | | Merge branch 'fix-vs2017-guid-braces' into releaseBrad King2017-04-201-7/+2
|\ \ \ | |_|/ |/| |
| * | VS: Fix project reference inspection in VS IDERichard Walters2017-04-201-7/+2
| |/ | | | | | | | | | | | | | | | | The braces around project reference GUIDs for vcxproj projects were apparently optional in the past, but Visual Studio 2017 is more strict, displaying a warning, and not displaying project reference properties unless the braces are present. Fixes: #16820
* | Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
|\ \
| * | FindBoost: Restore tolerance of backslashes in pathsAlex Turbov2017-04-191-2/+3
| |/ | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~136^2 (FindBoost: Search official location of prebuilt binaries on Windows, 2016-12-21) we pass input paths through `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` in more places than before. This broke tolerance of backslashes in paths provided by the user due to the macro argument re-parsing. Turn `_Boost_UPDATE_WINDOWS_LIBRARY_SEARCH_DIRS_WITH_PREBUILT_PATHS` into a function instead of macro to avoid re-parsing of macro arguments. Fixes: #16816
* | Merge branch 'FindOpenSSL-more-precompiled' into releaseBrad King2017-04-191-0/+4
|\ \
| * | FindOpenSSL: Add more library name alternativesAlex Turbov2017-04-191-0/+4
| |/ | | | | | | | | | | Add names found in OpenSSL 1.1.0 builds from [1]. [1] https://www.npcglib.org/~stathis/blog/precompiled-openssl/
* | CMake 3.8.0v3.8.0Brad King2017-04-101-1/+1
|/
* Merge branch 'vs-rc-defines' into releaseBrad King2017-04-101-0/+4
|\
| * RC: Mark CMAKE_RC_FLAGS_<CONFIG> cache entries as advancedBrad King2017-04-101-0/+4
| | | | | | | | | | | | These were added by commit v3.8.0-rc4~4^2~1 (RC: Add missing CMAKE_RC_FLAGS_<CONFIG> entries to cache, 2017-03-28) and should be advanced as they are for other languages.
* | Merge branch 'packaging-qtsdk' into releaseBrad King2017-04-102-17/+15
|\ \
| * | QtIFW: Improved packaging as part of the QtSDKKonstantin Podsvirov2017-04-082-17/+15
| | | | | | | | | | | | | | | | | | Changes: - Fix install script template (*.qs.in) to register on all platforms; - Add patch version numter to display name ("CMake X.Y" -> "CMake X.Y.Z").
* | | Merge branch 'emulatorTargetPropertyDocs' into releaseBrad King2017-04-101-0/+4
|\ \ \
| * | | Help: Cross compile variable used as initial value for target propertyCraig Scott2017-04-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Variable CMAKE_CROSSCOMPILING_EMULATOR is used to initialize CROSSCOMPILING_EMULATOR. Issue: #16785
* | | | Merge branch 'clarifyFileGenerateDocs' into releaseBrad King2017-04-101-0/+5
|\ \ \ \
| * | | | Help: Clarify file(GENERATE) only writes output file at generation phaseCraig Scott2017-04-101-0/+5
| |/ / / | | | | | | | | | | | | Closes: #16556
* | | | Merge branch 'clarifyRemoveDocs' into releaseBrad King2017-04-101-2/+4
|\ \ \ \
| * | | | Help: Clarify what the -f option does for the remove commandCraig Scott2017-04-101-2/+4
| |/ / / | | | | | | | | | | | | Closes: #16784
* | | | Merge branch 'FindwxWidgets-new-syslibs' into releaseBrad King2017-04-101-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | FindwxWidgets: link with the new required libs under MSWVadim Zeitlin2017-04-071-1/+1
|/ / / | | | | | | | | | | | | | | | Latest wxWidgets git master version and the upcoming 3.1.1 release requires linking with shlwapi and version DLLs. As this does no harm when using the previous versions, just do it unconditionally.
* | | Merge branch 'server-mode-test-no-pyc' into releaseBrad King2017-04-031-0/+1
|\ \ \
| * | | Tests: Avoid generating .pyc files during Server testBrad King2017-04-031-0/+1
| |/ / | | | | | | | | | | | | | | | Avoid writing any files to the source tree during testing. Fixes: #16770
* | | Merge branch 'mac-implicit-link-no-lto-flag' into releaseBrad King2017-04-032-1/+15
|\ \ \
| * | | CMakeParseImplicitLinkInfo: Ignore ld -lto_library flagBrad King2017-04-032-1/+15
| |/ / | | | | | | | | | | | | | | | | | | The `ld` tool in Xcode 8.3 now has a `-lto_library <path>` flag. Ignore the flag instead of accidentally parsing it as `-l` with `to_library`. Fixes: #16766
* | | Merge branch 'intel-compile-features' into releaseBrad King2017-03-311-1/+3
|\ \ \
| * | | Features: Update features for Intel C++ 17.0.2 on UNIXBrad King2017-03-311-1/+3
| |/ / | | | | | | | | | | | | | | | | | | Intel 17.0.2 on UNIX introduced a regression from 17.0.1 in its definition of `__cpp_constexpr` in `-std=c++14` mode. It incorrectly defines it as `200704` instead of the expected `201304`. Fix our feature detection table to account for this.
* | | Merge branch 'test-fix-CTestTestChecksum-dir' into releaseBrad King2017-03-311-2/+2
|\ \ \
| * | | Tests: Fix spurious CTestTestParallel failuresBrad King2017-03-311-2/+2
| |/ / | | | | | | | | | | | | | | | | | | If `CTestTestParallel` was run at the same time as `CTestTestChecksum` (e.g. during parallel testing) then the former fails due to the latter stepping on its directory. Fix the directory used for the latter to avoid the conflict.
* | | Merge branch 'ExternalProject-fix-remote-branch' into releaseBrad King2017-03-311-1/+4
|\ \ \
| * | | ExternalProject: Fix regression in GIT_TAG with remote branch nameBrad King2017-03-311-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc2~7^2 (ExternalProject: Run `git checkout` with `--` to clarify arguments, 2017-02-24) broke the case of `GIT_TAG some-remote-branch` because an explicit `--` means that the preceding argument is a tree-ish instead of a branch. Revert the change and leave a comment. Fixes: #16763
* | | CMake 3.8.0-rc4v3.8.0-rc4Brad King2017-03-301-1/+1
|/ /
* | Merge branch 'FindBoost-1.64-deps' into releaseBrad King2017-03-301-0/+1
|\ \
| * | FindBoost: Update 1.64 dependencies using 1.64 beta1Roger Leigh2017-03-301-0/+1
| | |
generated by cgit v0.12 at 2025-01-27 04:35:05 (GMT)