summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Make rcc output file suffix static (instead of pseudo-random)Sebastian Holtermann2017-10-301-2/+2
|
* Merge branch 'autogen-qrc-file-name' into release-3.10Brad King2017-10-301-5/+15
|\ | | | | | | Merge-request: !1422
| * Autogen: RCC: Append checksum suffix to wrapped file nameSebastian Holtermann2017-10-291-5/+15
| | | | | | | | Closes #17404
* | Merge branch 'cpack-rpm-dist-test-fix' into release-3.10Brad King2017-10-301-0/+5
|\ \ | | | | | | | | | Merge-request: !1424
| * | CPack/RPM: DIST-MONOLITHIC-type subtest fixDomen Vrankar2017-10-301-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Test was failing in case dist macro contained a + symbol which is valid but must be escaped for using the string as a regex. Fixes #17328
* | | Merge branch 'backport-fix-co-compile' into release-3.10Brad King2017-10-2716-87/+175
|\ \ \ | | | | | | | | | | | | Merge-request: !1418
| * | | cmcmd: Restore support for running multiple lint toolsBrad King2017-10-2715-61/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be one big if statement, 2017-08-28) incorrectly changed the logic to run only one lint tool at a time. Restore support for running all tools specified on the command-line.
| * | | cmcmd: Convert lint handlers to file-static functionsBrad King2017-10-272-29/+12
| | | | | | | | | | | | | | | | These do not need to be declared in the header.
| * | | cmcmd: Rename loop iteration variable for clarityBrad King2017-10-271-2/+2
| | | |
* | | | Merge branch 'autogen-static-library-cycles' into release-3.10Brad King2017-10-2710-17/+172
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1408
| * | | | Autogen: Tests: Add test for STATIC_LIBRARY cyclesSebastian Holtermann2017-10-279-0/+89
| | | | |
| * | | | Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependenciesSebastian Holtermann2017-10-271-17/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target from the cycle to the `_autogen` target dependencies. Closes #17389
* | | | | Merge branch 'cmp0040-wording' into release-3.10Brad King2017-10-263-5/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | Merge-request: !1415
| * | | | CMP0040: Clarify policy warning to match documentationBrad King2017-10-263-5/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~8^2~2 (Help: Clarify policy `CMP0040` documentation, 2016-01-28) the documentation was clarified to indicate that the target must be defined in the current directory. Do the same for the text of the policy warning itself. Fixes: #17399
* | | | Merge branch 'clang-cl-TP' into release-3.10Brad King2017-10-252-0/+2
|\ \ \ \ | |_|/ / |/| | | | | | | Merge-request: !1407
| * | | Clang: Use -TP flag for C++ sources with clang-clBrad King2017-10-252-0/+2
| |/ / | | | | | | | | | | | | | | | We do this for `cl`, so we should do it for `clang-cl`. Fixes: #17394
* | | Merge branch 'omp-oacc-werror-return-type' into release-3.10Brad King2017-10-242-3/+11
|\ \ \ | | | | | | | | | | | | Merge-request: !1406
| * | | Find{OpenMP,OpenACC}: Fix detection with -Werror=return-typeChristian Pfeiffer2017-10-242-3/+11
| |/ / | | | | | | | | | | | | | | | Explicitly return a value from `main` in our test sources. Fixes: #17391
* | | Merge branch 'findmpi-core-count' into release-3.10Brad King2017-10-241-7/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !1405
| * | | FindMPI: Use physical cores for MPIEXEC_MAX_NUMPROCSChristian Pfeiffer2017-10-241-7/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~224^2~1 (FindMPI: MPIEXEC handling improvements, 2017-04-21) the `ProcessorCount` module is being used to initialize `MPIEXEC_MAX_NUMPROCS`. However, this leads to the logical cores being counted rather than the physical ones, and some MPI implementations like OpenMPI will error if mpiexec is called with that number. Switch it to the number of physical cores using `cmake_host_system_information`. This ensures that if `MPIEXEC_MAX_NUMPROCS` is being used to set up MPI tests with CTest or similar that the tests won't spuriously fail due to OpenMPI refusing to start the application.
* | | Merge branch 'FindOpenCL-more-versions' into release-3.10Brad King2017-10-231-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1398
| * | | FindOpenCL: Add detection of OpenCL 2.1 and 2.2Henry Schreiner2017-10-231-1/+1
| |/ /
* | | Merge branch 'help_parse_arguments' into release-3.10Brad King2017-10-231-10/+13
|\ \ \ | | | | | | | | | | | | Merge-request: !1397
| * | | Help: Fix cmake_parse_arguments behavior for not found argumentsSylvain Joubert2017-10-201-10/+13
| | |/ | |/| | | | | | | | | | Value keywords are actually UNDEFINED rather than set to the empty string when they are not found in the argument list.
* | | Merge branch 'gnuid-cmp54-fix' into release-3.10Brad King2017-10-231-0/+5
|\ \ \ | | | | | | | | | | | | Merge-request: !1400
| * | | GNUInstallDirs: Enable CMP0054Christian Pfeiffer2017-10-231-0/+5
| | |/ | |/| | | | | | | Fixes: #17381
* | | Merge branch 'doc-cxx-std-msvc' into release-3.10Brad King2017-10-232-2/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !1401
| * | | Help: Correct <LANG>_STANDARD help w.r.t. MSVCChristian Pfeiffer2017-10-232-2/+4
| |/ / | | | | | | | | | Fixes: #17380
* | | Merge branch 'flang-remove-boundscheck' into release-3.10Brad King2017-10-191-2/+0
|\ \ \ | |_|/ |/| | | | | Merge-request: !1393
| * | Flang: Remove unsupported fbounds-check flagChristian Pfeiffer2017-10-191-2/+0
| |/ | | | | | | | | The Flang compiler neither supports nor documents -fbounds-check leading to -Wunused-command-line-argument warnings with the default Debug flags.
* | CMake 3.10.0-rc3v3.10.0-rc3Brad King2017-10-191-1/+1
| |
* | Merge branch 'vs-cuda-machine' into release-3.10Brad King2017-10-171-0/+7
|\ \ | | | | | | | | | Merge-request: !1390
| * | VS: Set CUDA TargetMachinePlatform explicitly on x64Brad King2017-10-171-0/+7
| |/ | | | | | | | | | | | | | | | | | | The `TargetMachinePlatform` setting tells CUDA what `--machine {32,64}` flag to pass to nvcc. While CUDA automatically chooses the proper default for the target architecture, it does not reflect this in the user-visible IDE settings. Set it explicitly to fix the user-visible setting. Fixes: #17355
* | Merge branch 'findopenmp-lib-paths' into release-3.10Brad King2017-10-171-7/+21
|\ \ | | | | | | | | | Merge-request: !1385
| * | FindOpenMP: Improve OMP libraries searchChristian Pfeiffer2017-10-171-7/+21
| | | | | | | | | | | | | | | | | | | | | This supports libraries given as full path and filters libraries given in CMAKE_<LANG>_STANDARD_LIBRARIES. Fixes: #17351
* | | Merge branch 'vs-2017-cl-check' into release-3.10Brad King2017-10-162-25/+40
|\ \ \ | | | | | | | | | | | | Merge-request: !1388
| * | | VS: Detect compiler component in VS 2017 instances more reliablyBrad King2017-10-162-19/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Microsoft.VisualStudio.Component.VC.Tools.x86.x64` component is not the only way a VS instance may provide the `cl` compiler tool. For example, VS 2017 Express Edition does not install that component. Instead search for the tools directly on disk within an instance. Suggested-by: Rich Chiodo <rchiodo@microsoft.com> Fixes: #17349
| * | | cmVSSetupHelper: Fix install location encoding conversionBrad King2017-10-161-2/+3
| | | |
| * | | cmVSSetupHelper: Factor out install location string constructionBrad King2017-10-162-6/+12
| | |/ | |/| | | | | | | This also adds a missing conversion to unix slashes in one code path.
* | | Merge branch 'imported-interface-no-system' into release-3.10Brad King2017-10-135-15/+22
|\ \ \ | | | | | | | | | | | | Merge-request: !1386
| * | | Help: Clarify documentation of NO_SYSTEM_FROM_IMPORTEDBrad King2017-10-132-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This property is meant to be set on the consumers of imported targets, not the imported targets themselves. Fixes: #17348
| * | | Do not initialize NO_SYSTEM_FROM_IMPORTED on INTERFACE librariesBrad King2017-10-134-7/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.8.0-rc1~276^2 (Allow NO_SYSTEM_FROM_IMPORTED on imported INTERFACE libraries, 2016-11-21) was incorrect. The property is not meant to be set on imported targets at all. It is meant to be set on their consumers that compile sources. Since INTERFACE libraries have no sources to compile, the property is not needed on them. Revert most of that change. Unfortunately we must still tolerate project code setting NO_SYSTEM_FROM_IMPORTED on INTERFACE libraries because they were allowed by CMake 3.8 and 3.9. Issue: #17348
* | | CMake 3.10.0-rc2v3.10.0-rc2Brad King2017-10-121-1/+1
| | |
* | | Merge branch 'FindXMLRPC-no-includes' into release-3.10Brad King2017-10-111-29/+14
|\ \ \ | | | | | | | | | | | | Merge-request: !1377
| * | | FindXMLRPC: Tolerate no include directoriesBrad King2017-10-111-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `xmlrpc-c-config $modules --cflags` may report no `-I` flags if the headers are in a standard location like `/usr/include`. In this case it is okay for `XMLRPC_INCLUDE_DIRS` to be empty. Ideally the `--cflags` output should be used as hints for a `find_path` call to really find the headers as we do for other find modules, but simply assuming no explicit include directories are needed is good enough for now. Fixes: #17347
| * | | FindXMLRPC: Drop unnecessary exec_program code pathsBrad King2017-10-111-28/+12
| |/ / | | | | | | | | | | | | We always have `execute_process` now, so drop our ancient `exec_program` code paths that are never used anymore.
* | | Merge branch 'clang-msvc-help' into release-3.10Brad King2017-10-113-0/+37
|\ \ \ | | | | | | | | | | | | Merge-request: !1373
| * | | Clang: Diagnose unsupported GNU-like clang targeting MSVC ABIBrad King2017-10-103-0/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The LLVM/Clang installer on Windows provides a `LLVM/bin` directory containing `clang.exe` and `clang++.exe` command-line tools that have a GNU-like command-line but target the MSVC ABI (instead of MinGW). We do not support this combination, so diagnose and reject it explicitly. Tell users what to do to use the `clang-cl.exe` tool instead. Issue: #16439
* | | Merge branch 'cpack-deb-mr-1296-fix' into release-3.10Brad King2017-10-115-6/+54
|\ \ \ | | | | | | | | | | | | Merge-request: !1375
| * | | CPack/Deb: fix for regex passing even if invalid characters are presentDomen Vrankar2017-10-101-2/+2
| | | | | | | | | | | | | | | | | | | | Regex [+-~] passes all characters between + and ~ and not only +, - and ~