summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindThreads-revert-libc-check' into release-3.14Brad King2019-02-271-11/+3
|\ | | | | | | Merge-request: !3022
| * FindThreads: Revert libc symbol check to pthread_createBrad King2019-02-271-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit e9a1ddc594 (FindThreads: Replace the pthread symbol checking in libc., 2018-11-18, v3.14.0-rc1~292^2) we check libc for `pthread_kill` instead of `pthread_create`. However, on FreeBSD `pthread_kill` is in libc but not `pthread_create`. Discussion in the original merge request for the above commit also considered `pthread_key_create`, `pthread_self`, and `pthread_attr_init`. Every symbol seems to have some reason it is not an appropriate choice. Revert to the pre-3.14 behavior of using `pthread_create` pending further investigation.
| * FindThreads: Fix libc check to use proper header for pthread_killBrad King2019-02-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | In commit e9a1ddc594 (FindThreads: Replace the pthread symbol checking in libc., 2018-11-18, v3.14.0-rc1~292^2) we switched to checking for `pthread_kill` in libc but did not update the symbol check's header file to match. Add `signal.h` to get `pthread_kill`. Keep `pthread.h` anyway since the purpose of the check is to verify that the pthread API works. Fixes: #18984
* | Merge branch 'cmake_role-vs-fix' into release-3.14Brad King2019-02-273-1/+8
|\ \ | | | | | | | | | Merge-request: !3028
| * | CMAKE_ROLE: Fix value in --build for Visual Studio generatorsKyle Edwards2019-02-263-1/+8
| | | | | | | | | | | | Fixes: #18990
* | | Merge branch 'docs-rpath-origin-apple' into release-3.14Brad King2019-02-271-7/+7
|\ \ \ | | | | | | | | | | | | Merge-request: !3020
| * | | Help: Fix minor inaccuracies of what BUILD_RPATH_USE_ORIGIN affectsCraig Scott2019-02-271-7/+7
| | |/ | |/|
* | | Merge branch 'FindOctave-remove' into release-3.14Brad King2019-02-2710-266/+0
|\ \ \ | | | | | | | | | | | | Merge-request: !3027
| * | | FindOctave: Remove module pending further workBrad King2019-02-2610-266/+0
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `FindOctave` module added by commit 170bcb6fdc (FindOctave: Add module to find GNU octave, 2018-11-17, v3.14.0-rc1~283^2) has a few problems in its implementation that need to be worked out before the module can be included in a CMake release. These were missed during review. Remove the module for now. It can be restored later with a fresh review. Issue: #18991
* | | Merge branch 'include_external_msproject-exclude-from-all' into release-3.14Brad King2019-02-271-1/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !3025
| * | | include_external_msproject: Restore support for EXCLUDE_FROM_ALLBrad King2019-02-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit dc6888573d (Pass EXCLUDE_FROM_ALL from directory to targets, 2019-01-15, v3.14.0-rc1~83^2) all `AddNewTarget` call sites were updated to copy the directory-level `EXCLUDE_FROM_ALL` into the target property of the same name, except that the one for `include_external_msproject` was incorrectly missed. Add it now. Furthermore, refactoring in commit b99129d2d8 (ENH: some code cleanup, 2007-03-12, v2.6.0~2020) accidentally set the `EXCLUDE_FROM_ALL` target property of `include_external_msproject`-generated targets to `FALSE` instead of simply leaving it unset. This was not necessary but had no effect until the above commit gave it a meaning. Drop that. Fixes: #18986
* | | | Merge branch 'vs-llvm-extension' into release-3.14Brad King2019-02-271-2/+9
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3024
| * | | | VS: Fix detection of clang-cl with -T llvmBrad King2019-02-261-2/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a VS generator with `-T llvm`, MSBuild relies on the "LLVM Compiler Toolchain" VS Extension. This does not put `clang-cl` in the `PATH` inside the build, and LLVM no longer provides a `cl` replacement either. Therefore we need another way to extract the path to the `CMAKE_{C,CXX}_COMPILER`. Fortunately the LLVM VS integration provides a `$(ClangClExecutable)` macro we can reference to get the path. Fixes: #18983
* | | | Merge branch 'restore-min-cmake-3.1' into release-3.14Brad King2019-02-271-3/+3
|\ \ \ \ | |_|_|/ |/| | | | | | | Merge-request: !3021
| * | | Tests: Restore support for CMake 3.1 through 3.6 with MSVCBrad King2019-02-261-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit a5dd159990 (Tests: Fix RunCMake.try_compile CxxStandard case on MSVC, 2017-09-22, v3.10.0-rc1~63^2) introduced use of `if()` conditions not supported until CMake 3.7, so while it was intended to restore support for CMake versions prior to 3.9, it actually only did so for 3.7 and 3.8. Backport the logic to work with CMake 3.1. Fixes: #18987
* | | Merge branch 'doc-ctest-build-and-test-summary' into release-3.14Brad King2019-02-261-2/+3
|\ \ \ | | | | | | | | | | | | Merge-request: !3017
| * | | Help: Fix --build-and-test synopsis in ctest(1)Paul Seyfert2019-02-261-2/+3
| |/ / | | | | | | | | | | | | | | | The synopsis added by commit 9d3aa95ca4 (Help: Divide ctest(1) manual options into sections, 2017-11-08, v3.11.0-rc1~359^2~2) is missing the actual `--build-and-test` argument! Add it now.
* | | Merge branch 'qcc-asm-detection' into release-3.14Brad King2019-02-252-0/+6
|\ \ \ | | | | | | | | | | | | Merge-request: !3016
| * | | Add ASM Compiler detection for QCCMaikel van den Hurk2019-02-252-0/+6
| | | |
* | | | Merge branch 'releasenotes_arch_independent' into release-3.14Brad King2019-02-251-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3012
| * | | | Help: Add release note for new ARCH_INDEPENDENT optionCraig Scott2019-02-241-0/+5
| | |/ / | |/| |
* | | | Merge branch 'docs_try_commands' into release-3.14Brad King2019-02-252-25/+33
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !3013
| * | | | Help: Caveat for try_compile() and CMAKE_TRY_COMPILE_PLATFORM_VARIABLESCraig Scott2019-02-241-1/+3
| | | | |
| * | | | Help: Consistency in try_compile() docs for target typeCraig Scott2019-02-241-8/+14
| | | | |
| * | | | Help: try_compile() readability and grammar improvementsCraig Scott2019-02-241-6/+6
| | | | |
| * | | | Help: User-provided variable names for try_* commandsCraig Scott2019-02-242-12/+12
| |/ / / | | | | | | | | | | | | | | | | All uppercase is typically used for command keywords. Non-keyword arguments should generally be shown as `<something>` according to the CMake documentation guide.
* | | | Merge branch 'check_lang_source_runs_output' into release-3.14Brad King2019-02-252-2/+12
|\ \ \ \ | |_|_|/ |/| | | | | | | Merge-request: !3011
| * | | CheckLangSourceRuns: Capture run output to log filesCraig Scott2019-02-232-2/+12
| |/ / | | | | | | Fixes: #18973
* | | Merge branch 'remove-exclude-from-all-warning' into release-3.14Brad King2019-02-225-20/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !3002
| * | | EXCLUDE_FROM_ALL: Don't warn if installing target excluded from allCraig Scott2019-02-215-20/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The original warning pre-dates support for install components. There are now legitimate scenarios where an install(TARGETS) command may list a target that is excluded from all, e.g. hierarchical projects that will never install the component such a target belongs to. Fixes: #18938
* | | Merge branch 'link-options' into release-3.14Brad King2019-02-202-18/+8
|\ \ \ | | | | | | | | | | | | Merge-request: !2996
| * | | PIE link options: No warning when policy CMP0083 is not set.Marc Chevrier2019-02-202-18/+8
| |/ / | | | | | | | | | Fixes: #18955
* | | Merge branch 'fix-implicit-includes-fortran' into release-3.14Brad King2019-02-202-10/+21
|\ \ \ | | | | | | | | | | | | Merge-request: !2994
| * | | Fortran: Do not suppress explicit use of implicit include directoriesBrad King2019-02-202-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2e91627dea (ParseImplicitIncludeInfo: add Fortran implicit include handling, 2019-01-25, v3.14.0-rc1~73^2) we actually populate `CMAKE_Fortran_IMPLICIT_INCLUDE_DIRECTORIES` for the first time. This value may be useful to project code to pass to other tooling that wants to preprocess the way Fortran does, so we should compute the value. However, compilers like `gfortran` do not actually search their own implicit include directories for `.mod` files. The directories must be passed via `-I` in order for `.mod` files in them to be found. Since Fortran has no standard library header files that we need to avoid overriding, it is safe to *not* filter out implicit include directories from those passed explicitly via `-I` options. Skip this filtering so that include directories specified by project code to find `.mod` files will be searched by the compiler even if they happen to be implicitly searched by the preprocessor. Fixes: #18914
* | | | Merge branch 'autogen_cache_binary_checks' into release-3.14Brad King2019-02-194-39/+88
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2990
| * | | | Autogen: Use output caching GetExecutableTestOutputSebastian Holtermann2019-02-192-39/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the output caching cmQtAutoGenGlobalInitializer::GetExecutableTestOutput method to avoid identical calls to moc, uic and rcc. Closes #18947
| * | | | Autogen: Add output caching GetExecutableTestOutputSebastian Holtermann2019-02-192-0/+70
| | |/ / | |/| | | | | | | | | | | | | | | | | | This adds the cmQtAutoGenGlobalInitializer::GetExecutableTestOutput method which caches the output of the called executable and returns the cached value on any subsequent call.
* | | | Merge branch 'vs-win-sdk' into release-3.14Brad King2019-02-193-3/+19
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2989
| * | | | VS: Tell VS 2019 to use Windows SDK 8.1 explicitly when neededBrad King2019-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2019 does not default to the 8.1 SDK as VS 2017 and VS 2015 did. When `CMAKE_SYSTEM_VERSION` is 8.1 or lower, select the 8.1 SDK explicitly. Fixes: #18927
| * | | | VS: Factor out a method to set the Windows SDK version internallyBrad King2019-02-192-3/+13
| |/ / /
* | | | Merge branch 'asm-no-slash-question' into release-3.14Brad King2019-02-193-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2984
| * | | | Use -? instead of /? to test compiler for MSVC-like command-line supportBrad King2019-02-193-3/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | MS-style command-line tools accept either `/` or `-` for command-line options. Prefer `-` over `/` so that non-MS tools do not treat it as a path. Fixes: #18941
* | | | Merge branch 'fix-legacy-implicit-includes' into release-3.14Brad King2019-02-193-37/+44
|\ \ \ \ | | |/ / | |/| | | | | | Merge-request: !2981
| * | | Do not explicitly report "standard" include directories as implicitBrad King2019-02-182-20/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 1293ed8507 (ParseImplicitIncludeInfo: keep implicit incl. consistent when rerunning cmake, 2019-01-30, v3.14.0-rc1~26^2) we did not account for `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`. This variable lets platform modules or toolchain files specify directories that are to be explicitly passed as standard include directories. These include directories are used by the test project from which we extract implicit include directories so they appear in the parsed results whether or not the compiler really considers them implicit. Exclude these entries from the computed implicit include directories since they are not actually implied by the compiler when we invoke it with "standard" include directories passed explicitly. Instead teach the build system generators to treat the "standard" directories as implicit for purposes of excluding them from appearing earlier in the compiler command line due to `include_directories` and `target_include_directories` calls. Issue: #18936, #18944
| * | | Restore unconditional use of "standard" include directoriesBrad King2019-02-181-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` is meant to unconditionally add explicitly specified include directories to compile lines. In commit 5f34bdc7f9 (cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` method, 2019-01-25, v3.14.0-rc1~65^2~1) a condition was accidentally added to exclude implicit include directories. Drop that condition. Fixes: #18936
| * | | Prefix implicit include directories with sysroot on constructionBrad King2019-02-182-15/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 7cd65c97fa (Add CMAKE_SYSROOT variable to set --sysroot when cross compiling., 2013-04-13, v3.0.0-rc1~342^2) we have prefixed the value of `CMAKE_SYSROOT` to implicit include directories. This was done because we hard-coded `/usr/include` as an implicit include directory without accounting for the sysroot. Instead we should prefix the hard-coded paths when they are constructed. Update the `Platform/UnixPaths` module to do this as `Platform/Darwin` already does. Since commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) the values of the `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` variables are computed from a real compiler invocation so they already account for the sysroot prefix. In commit 6fc3382944 (Update logic for sysroot in detected implicit include directories, 2019-02-13, v3.14.0-rc2~6^2) we attempted to apply the prefix conditionally, but that is incorrect because the compiler's real implicit include directories are not all under the sysroot. Instead assume that all implicit include directories in `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES` already have the sysroot prefix if needed. Code that constructs the value must be responsible for that because it is the only place that knows.
* | | | Merge branch 'FindBoost-layout-tagged' into release-3.14Brad King2019-02-191-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2961
| * | | | FindBoost: Find boost libraries built with --layout=taggedYves Frederix2019-02-181-0/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Pick up libraries of the form `boost_system-mt-x64`, which do not have the version suffix. Fixes: #18908
* | | | Merge branch 'file_symlink_docs' into release-3.14Brad King2019-02-181-23/+23
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2974
| * | | | Help: Clarify and improve readability of link-related file subcommandsCraig Scott2019-02-161-23/+23
| |/ / /