summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'FindBISON-fix-verbose-file' into release-3.13Brad King2018-10-091-7/+14
|\ | | | | | | Merge-request: !2467
| * FindBISON: Fix "multiple rules generate" error on VERBOSE outputBrad King2018-10-091-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `BISON_TARGET` is called with both VERBOSE <extra-file> REPORT_FILE <file> we add a custom command to copy `<file>` to `<extra-file>`. The change in commit v3.7.1~10^2 (FindBISON: Do not rebuild every time when not VERBOSE, 2016-11-14) incorrectly listed the extra file as an output of the main bison invocation custom command, but it is actually produced by the separate copy command. Fix the logic to always generate `<file>` as an output of the bison command and `<extra-file>` as an output of the copy command. Fixes: #18433
* | Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13Brad King2018-10-091-1/+11
|\ \ | | | | | | | | | Merge-request: !2464
| * | string(TIMESTAMP): Fix unset TZJose Luis Blanco-Claraco2018-10-091-1/+11
| |/ | | | | | | | | | | | | | | | | The logic added by commit v3.6.0-rc1~338^2 (CMake: Extend TIMESTAMP sub-commands with new unix time format specifier, 2016-02-16) to restore the `TZ` environment variable does not properly handle the case in which the variable was originally not set. Unset the variable in this case. Fixes: #18431
* | Merge branch 'doc-regex-backslash' into release-3.13Brad King2018-10-091-6/+13
|\ \ | | | | | | | | | Merge-request: !2460
| * | Help: Fix documentation of escape sequences in a regexBrad King2018-10-091-6/+13
| |/ | | | | | | | | | | | | | | | | | | Documentation added by commit 4b35dab891 (Help: Document how escape sequences work in a regex, 2018-07-18) is only correct for backslashes inside `[]` groups. The regex engine does interpret `\` escapes elsewhere. Fix the docs. Inspired-by: R2RT <artur.ryt@gmail.com> Fixes: #18428
* | Merge branch 'vs-flag-map-Qspectre' into release-3.13Brad King2018-10-093-0/+11
|\ \ | | | | | | | | | Merge-request: !2462
| * | VS: Add flag table entry for -QspectreBrad King2018-10-083-0/+11
| |/ | | | | | | | | | | | | Add special logic to map this flag to a top-level build setting instead of being in ClCompile. Fixes: #18426
* | Merge branch 'mkl_ilp64' into release-3.13Brad King2018-10-092-21/+37
|\ \ | | | | | | | | | Merge-request: !2444
| * | Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACKJakub Benda2018-10-082-21/+37
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modern Intel MKL packages offer 64-bit BLAS and LAPACK libraries in any of the eight combinations of the following three binary options: - sequential or threaded - LP64 or ILP64 - static or shared The modules FindBLAS and FindLAPACK did not allow full selection of arbitrary combination; in particular, only LP64 variant was used. The original list of possible BLA_VENDOR values related to MKL, Intel10_64lp Intel10_64lp_seq is thus extended by another pair of "vendors", Intel10_64ilp Intel10_64ilp_seq Depending on the selection, either "_lp64", or "_ilp64" MKL libraries are searched for. Some comments in the two CMake modules were modified to indicate that even though the "vendors" contain the number "10", they also apply to all further versions of MKL.
* | Merge branch 'doc-target_link_libraries-keywords-not-genex' into release-3.13Brad King2018-10-081-6/+18
|\ \ | | | | | | | | | Merge-request: !2449
| * | Help: Clarify target_link_libraries keywords and generator expressionsBrad King2018-10-081-6/+18
| |/ | | | | | | | | | | | | | | | | | | The `optimized` and `debug` keyword items are meaningful only to the `target_link_libraries` command and have no meaning when produced by a generator expression. State this explicitly. Also recommend use of a quoted argument when the genex itself may contain a semicolon. Fixes: #18424
* | Merge branch 'project-always-set-desc-url' into release-3.13Brad King2018-10-084-12/+37
|\ \ | | | | | | | | | Merge-request: !2457
| * | project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are setCraig Scott2018-10-072-12/+10
| | | | | | | | | | | | | | | | | | | | | | | | If a project() call does not have DESCRIPTION or HOMEPAGE_URL options, it must still set the relevant variables or else those variables will inherit values from an earlier project() call. That is inconsistent with how VERSION is handled and is likely to be unexpected. The docs were also ambiguous about what should happen in such cases.
| * | project(): Add tests verifying variables set by second project() callCraig Scott2018-10-072-0/+27
| |/
* | Merge branch 'add_ctest_progress_docs' into release-3.13Brad King2018-10-083-4/+32
|\ \ | | | | | | | | | Merge-request: !2454
| * | Help: Add missing docs for the ctest --progress optionCraig Scott2018-10-073-0/+28
| | | | | | | | | | | | These docs were missing from the changes that introduced the feature in !2240.
| * | Help: Use :envvar: links for env vars affecting ctest commandCraig Scott2018-10-071-4/+4
| |/
* | Merge branch 'list-SORT-docs' into release-3.13Brad King2018-10-081-11/+15
|\ \ | | | | | | | | | Merge-request: !2453
| * | Help: Improve/fix incorrect docs for list(SORT) sub-optionsCraig Scott2018-10-061-11/+15
| |/
* | Merge branch 'UseSWIG-php-regression' into release-3.13Brad King2018-10-081-0/+4
|\ \ | | | | | | | | | Merge-request: !2448
| * | UseSWIG: fix regression for PHP languageMarc Chevrier2018-10-051-0/+4
| | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module, 2018-01-29) accidentally regressed support for PHP. Fix it. Fixes: #18421
* | | Merge branch 'autogen-moc-predef-cross-compile' into release-3.13Brad King2018-10-082-0/+9
|\ \ \ | | | | | | | | | | | | Merge-request: !2452
| * | | Android: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we set `CMAKE_<LANG>_COMPILER_TARGET` to the Android target architecture, add it to `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` also. This is needed to make moc predefines aware of `__ANDROID__`. Fixes: #18425
| * | | Autogen: Add clang --target= flag to compiler predefines commandBrad King2018-10-051-0/+8
| | |/ | |/| | | | | | | | | | | | | | | | Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`. Issue: #18425
* | | Merge branch 'doc-find_package-update' into release-3.13Brad King2018-10-051-35/+48
|\ \ \ | | | | | | | | | | | | Merge-request: !2446
| * | | Help: Clarify find_package Module and Config mode relationJoachim Wuttke (l)2018-10-041-17/+17
| | | |
| * | | Help: Remove redundant recommendationBrad King2018-10-041-12/+4
| | | | | | | | | | | | | | | | | | | | We suggest that users prefer the basic signature in two places. Drop the latter and move its related content to a better section.
| * | | Help: Add internal section link to find_package command docsJoachim Wuttke (l)2018-10-041-6/+8
| | | |
| * | | Help: Add section headers to find_package commandJoachim Wuttke (l)2018-10-041-0/+15
| | | | | | | | | | | | | | | | | | | | The document is pretty long but is already mostly organized into sections. Add explicit section headers.
| * | | Help: Move find_package NO_POLICY_SCOPE to more appropriate locationJoachim Wuttke (l)2018-10-041-3/+3
| | | |
| * | | Help: Add table of contents to find_package command docsJoachim Wuttke (l)2018-10-041-0/+4
| | | |
| * | | Help: Rephrase summary in find_package command docsJoachim Wuttke (l)2018-10-041-1/+1
| |/ /
* | | Merge branch 'doc-osx-vars-as-cache' into release-3.13Brad King2018-10-041-0/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !2443
| * | | Help: Document CMAKE_OSX_* variables as cache entriesJames Turner2018-10-041-0/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables * CMAKE_OSX_ARCHITECTURES * CMAKE_OSX_DEPLOYMENT_TARGET * CMAKE_OSX_SYSROOT should be set as cache entries. Document this explicitly.
* | | Merge branch 'pkgc-op-lt-gt' into release-3.13Brad King2018-10-044-1/+91
|\ \ \ | | | | | | | | | | | | Merge-request: !2435
| * | | FindPkgConfig: support also > and < operators for version comparesRolf Eike Beer2018-10-044-1/+91
| |/ / | | | | | | | | | Fixes: #18416
* | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-049-13/+13
|\ \ \ | | | | | | | | | | | | Merge-request: !2440
| * | | Fix misc. typosluz.paz2018-10-039-13/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Found via `codespell -q 3 -I ../cmake-whitelist.txt --skip="./Utilities"` where the whitelist consists of ``` aci ans behaviour buil convertor dum earch ect emmited emmitted helpfull iff isnt ith lowercased mose nd nknown nto objext ot pathes pevents splitted substract superceded supercedes te tim todays uint upto whitespaces ```
* | | Merge branch 'doc-cmp0077' into release-3.13Brad King2018-10-042-6/+44
|\ \ \ | | | | | | | | | | | | Merge-request: !2439
| * | | Help: Clarify policy CMP0077 documentationBrad King2018-10-032-6/+44
| |/ / | | | | | | | | | | | | | | | | | | Add background about the case in which the policy is relevant. Describe the OLD and NEW behaviors more completely. Fixes: #18418
* | | Merge branch 'platform-gnu' into release-3.13Brad King2018-10-041-0/+27
|\ \ \ | | | | | | | | | | | | Merge-request: !2438
| * | | Platform/GNU: Add Debian shared library permissions policySvante Signell2018-10-031-0/+27
| |/ / | | | | | | | | | | | | | | | Copy the `CMAKE_INSTALL_SO_NO_EXE` setting from `Platform/Linux`. Fixes: #18376
* | | CMake 3.13.0-rc1 version updateBrad King2018-10-032-4/+4
| | |
* | | Help: Drop development topic notes to prepare releaseBrad King2018-10-032-9/+0
|/ / | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* | Merge topic 'doc-3.13-relnotes'Brad King2018-10-0342-266/+233
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 00d96c51c9 Help: Organize and revise 3.13 release notes 2fd2c8cb7e Help: Consolidate 3.13 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !2426
| * | Help: Organize and revise 3.13 release notesBrad King2018-10-011-123/+161
| | | | | | | | | | | | | | | Add section headers similar to the 3.12 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * | Help: Consolidate 3.13 release notesBrad King2018-10-0142-266/+195
| | | | | | | | | | | | | | | Run the `Utilities/Release/consolidate-relnotes.bash` script to move notes from `Help/release/dev/*` into `Help/release/3.13.rst`.
* | | Merge topic 'ctest-num-width'Brad King2018-10-031-2/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d28884617 cmCTestRunTest: Avoid float/int conversions in number width logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2433
| * | | cmCTestRunTest: Avoid float/int conversions in number width logicBrad King2018-10-021-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use of `std::log10` added by commit 02c5091c90 (cmCTestRunTest: Simplify number width computation, 2018-09-08) broke our number width computation on some platforms where static_cast<int>(std::log10(static_cast<size_t>(10))) somehow produces `0` instead of `1`. Re-implement the logic to avoid floating-point computations.