summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'string-TIMESTAMP-unset-TZ'Brad King2018-10-091-1/+11
|\ | | | | | | | | | | | | | | f23760ffac string(TIMESTAMP): Fix unset TZ Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Attila Krasznahorkay <attila.krasznahorkay@gmail.com> 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 'release-3.13'Brad King2018-10-090-0/+0
|\ \
| * \ Merge branch 'doc-regex-backslash' into release-3.13Brad King2018-10-091-6/+13
| |\ \ | | | | | | | | | | | | Merge-request: !2460
| * \ \ Merge branch 'vs-flag-map-Qspectre' into release-3.13Brad King2018-10-093-0/+11
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2462
| * \ \ \ Merge branch 'mkl_ilp64' into release-3.13Brad King2018-10-092-21/+37
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2444
| * \ \ \ \ Merge branch 'doc-target_link_libraries-keywords-not-genex' into release-3.13Brad King2018-10-081-6/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2449
* | \ \ \ \ \ Merge topic 'doc-regex-backslash'Brad King2018-10-091-6/+13
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fab2c2339b Help: Fix documentation of escape sequences in a regex Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'mkl_ilp64'Brad King2018-10-092-21/+37
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | d0fb3e6c52 Find{BLAS,LAPACK}: Find also ILP64 MKL BLAS and LAPACK Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'vs-flag-map-Qspectre'Brad King2018-10-093-0/+11
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | bb60ed6e72 VS: Add flag table entry for -Qspectre Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'doc-target_link_libraries-keywords-not-genex'Brad King2018-10-091-6/+18
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | cd8c79e163 Help: Clarify target_link_libraries keywords and generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'update-prebuilt-openssl'Brad King2018-10-091-3/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2461
| * | | Utilities/Release: Update to openssl-1.1.1Brad King2018-10-081-3/+3
| | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | CMake Nightly Date StampKitware Robot2018-10-091-1/+1
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-080-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'project-always-set-desc-url' into release-3.13Brad King2018-10-084-12/+37
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2457
| * \ \ \ Merge branch 'add_ctest_progress_docs' into release-3.13Brad King2018-10-083-4/+32
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2454
| * \ \ \ \ Merge branch 'list-SORT-docs' into release-3.13Brad King2018-10-081-11/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2453
* | \ \ \ \ \ Merge topic 'add_ctest_progress_docs'Brad King2018-10-083-4/+32
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2154ea38f9 Help: Add missing docs for the ctest --progress option fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Wegner <michael.t.wegner@gmail.com> 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 topic 'project-always-set-desc-url'Brad King2018-10-084-12/+37
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set b27247c8df project(): Add tests verifying variables set by second project() call Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'list-SORT-docs'Brad King2018-10-081-11/+15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2453
| * | | | Help: Improve/fix incorrect docs for list(SORT) sub-optionsCraig Scott2018-10-061-11/+15
| |/ / /
* | | | Merge branch 'release-3.13'Brad King2018-10-080-0/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'UseSWIG-php-regression' into release-3.13Brad King2018-10-081-0/+4
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2448
| * \ \ \ Merge branch 'autogen-moc-predef-cross-compile' into release-3.13Brad King2018-10-082-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2452
* | \ \ \ \ Merge branch 'release-3.12'Brad King2018-10-080-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'UseSWIG-php-regression' into release-3.12Brad King2018-10-051-0/+4
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | Merge-request: !2448
* | | | | | | Merge topic 'UseSWIG-php-regression'Brad King2018-10-081-0/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecd0fec40b UseSWIG: fix regression for PHP language Acked-by: Kitware Robot <kwrobot@kitware.com> 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 topic 'autogen-moc-predef-cross-compile'Brad King2018-10-082-0/+9
|\ \ \ \ \ \ | | |_|/ / / | |/| | | / | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 66f49d1f9a Android: Add clang --target= flag to compiler predefines command 39534c58c5 Autogen: Add clang --target= flag to compiler predefines command Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: André Klitzing <aklitzing@gmail.com> 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
* | | | CMake Nightly Date StampKitware Robot2018-10-081-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-071-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-10-061-1/+1
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-050-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'doc-find_package-update' into release-3.13Brad King2018-10-051-35/+48
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2446
* | \ \ \ Merge topic 'doc-find_package-update'Brad King2018-10-051-35/+48
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c90f3dff82 Help: Clarify find_package Module and Config mode relation 26dac50220 Help: Remove redundant recommendation 11058a2e7c Help: Add internal section link to find_package command docs aaf5ea2d70 Help: Add section headers to find_package command 56310b0671 Help: Move find_package NO_POLICY_SCOPE to more appropriate location 336dce1c95 Help: Add table of contents to find_package command docs 463d59d331 Help: Rephrase summary in find_package command docs Acked-by: Kitware Robot <kwrobot@kitware.com> 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.