summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'sdcc-compiler-id' into releaseBrad King2017-03-291-2/+8
|\ \
| * | SDCC: Fix identification of current sdcc compilerBrad King2017-03-291-2/+8
| |/ | | | | | | | | | | | | | | The sdcc compiler no longer defines the `SDCC` preprocessor macro. Instead `__SDCC_VERSION_MAJOR` and similar component-wise macros are defined. Use them instead if defined. Issue: #16746
* | Merge branch '16742-swift-3.0' into releaseBrad King2017-03-294-9/+15
|\ \
| * | Swift: Simplify mixed test case to make it version agnosticGregor Jasny2017-03-292-20/+3
| | | | | | | | | | | | Issue: #16742
| * | Swift: Default to Swift 3.0 with Xcode 8.3 and laterGregor Jasny2017-03-284-3/+26
| |/ | | | | | | | | | | | | Xcode 8.3 has dropped support for Swift 2.3 so that compiler and feature detection failed. Closes #16742
* | Merge branch 'vs-rc-defines' into releaseBrad King2017-03-296-7/+37
|\ \
| * | 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 'libarchive-backport-zip-dir-fix' into releaseBrad King2017-03-271-16/+20
|\ \
| * | libarchive: backport zip directory recognition fixBrad King2017-03-271-16/+20
| |/ | | | | | | | | | | | | Backport upstream libarchive commit 2ecf8d1c1e (Try harder to detect directories in zip archives, 2016-12-23). Fixes: #16741
* | Merge branch 'ninja-fix-sysconf-non-limit' into releaseBrad King2017-03-271-5/+9
|\ \
| * | Ninja: Fix command line limit when sysconf has no ARG_MAXChristian Pfeiffer2017-03-271-5/+9
| |/ | | | | | | | | | | | | | | | | The `sysconf(3)` manual explains that the return value can be `-1` for limits if there is no definite limit. Recognize this case and skip using the value as a limit candidate. Otherwise we use response files unconditionally on such systems instead of checking other limits. Fixes: #16740
* | Merge branch 'InstallRequiredSystemLibraries-vs2017' into releaseBrad King2017-03-272-7/+32
|\ \
| * | 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
| * | Add undocumented CMake language means to find VS 2017Brad King2017-03-271-0/+13
| | | | | | | | | | | | | | | | | | Add a query to the `cmake_host_system_information` command to get the location of a VS 2017 installation. Leave it undocumented and for internal use for now.
| * | 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 branch 'cpack-rpm-tests-handle-build-id-links' into releaseBrad King2017-03-273-5/+11
|\ \ \
| * | | CPack/RPM tests: handle build-id linksDomen Vrankar2017-03-273-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Build id links generation was introduced in rpm 4.13.0.1 so files related to them should be ignored as they are not relevant for the tests. Fixes #16710
* | | | Merge branch 'cpack-rpm-debuginfo-docs-cleanup' into releaseBrad King2017-03-271-8/+0
|\ \ \ \
| * | | | 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.
* | | | CMake 3.8.0-rc3v3.8.0-rc3Brad King2017-03-241-1/+1
|/ / /
* | | 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
generated by cgit v0.12 at 2025-01-24 12:32:46 (GMT)