summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Testing: Update hard-coded line numbers to [0-9]+ in some testsKyle Edwards2018-10-1096-143/+143
|
* Merge branch 'release-3.12'Brad King2018-10-100-0/+0
|\
| * Merge branch 'backport-FindMatlab-missing-install' into release-3.12Brad King2018-10-101-12/+14
| |\ | | | | | | | | | Merge-request: !2471
* | \ Merge topic 'backport-FindMatlab-missing-install'Brad King2018-10-100-0/+0
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 7772bd31f5 FindMatlab: Guard against nonexistent installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2471
| * | FindMatlab: Guard against nonexistent installationChuck Atkins2018-10-101-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logic added by commit v3.12.0-rc1~183^2 (FindMatlab: Matlab Runtime Compiler support, 2017-04-29) assumes that `VersionInfo.xml` exists in the installation. Fix it to tolerate a missing or empty file. This change was originally made by commit v3.13.0-rc1~173^2 (FindMatlab: Guard against nonexistent installation, 2018-08-27). Here we backport it to the 3.12.x series. Fixes: #18436
* | | Merge topic 'module-index-restructure'Craig Scott2018-10-103-42/+73
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc372f6eef Help: Document Use_wxWindows.cmake as deprecated 846e3d2ceb Help: Reorganise module index into sections c9cedd675b Help: Add link to cmake-qt(7) to FindQt.cmake. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2463
| * | | Help: Document Use_wxWindows.cmake as deprecatedCraig Scott2018-10-092-1/+3
| | | | | | | | | | | | | | | | The implementation already logged a message saying that the module was deprecated. This change adds that message to the module docs.
| * | | Help: Reorganise module index into sectionsJoachim Wuttke (l)2018-10-091-37/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Split up module list into separate sections for utility modules and find modules. * Improve wording to explain how the different module types are expected to be called/used. * Move deprecated modules to their own separate sections.
| * | | Help: Add link to cmake-qt(7) to FindQt.cmake.Joachim Wuttke (l)2018-10-091-5/+5
| | | |
* | | | Merge branch 'release-3.13'Brad King2018-10-100-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-102-44/+118
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2469
* | \ \ \ \ Merge topic 'update-vim-syntax'Brad King2018-10-102-44/+118
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7330a89f56 Merge branch 'upstream-vim-cmake-syntax' 456d96f0d5 vim-cmake-syntax 2018-10-10 (ac1957fb) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2469
| * | | | | Merge branch 'upstream-vim-cmake-syntax'Patrick Boettcher2018-10-102-44/+118
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2018-10-10 (ac1957fb)
| | * | | | | vim-cmake-syntax 2018-10-10 (ac1957fb)vim-cmake-syntax upstream2018-10-102-46/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit ac1957fbccd24abc91089517f9116272825f8340 (master). Upstream Shortlog ----------------- Pablo Hernandez-Cerdan (1): baf680ae Add syntax for new cmake variables Patrick Boettcher (5): 2c9d5fda handle bracket-comments and arguments correctly 37d3bcb0 add test for bracket-comments and arguments 99b4a3d9 promote package_config_file-st to .in-file and add test 3ed26c29 update to cmake version 3.13.20181010-ga3598 ac1957fb update README
* | | | | | | Merge topic 'project-version'Brad King2018-10-101-59/+88
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2f43bd3b6c Help: move description of CMAKE_PROJECT_* variables e3e5445d83 Help: Describe options of command project in a definition list. 5b56795d57 Help: make the two signatures of command "project" orthogonal Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2450
| * | | | | | | Help: move description of CMAKE_PROJECT_* variablesJoachim Wuttke (o)2018-10-091-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Describe these variables along with the other variables.
| * | | | | | | Help: Describe options of command project in a definition list.Joachim Wuttke (l)2018-10-091-51/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add section headers; explain default setting of optional argument variables.
| * | | | | | | Help: make the two signatures of command "project" orthogonalJoachim Wuttke (l)2018-10-091-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'if-synopsis'Brad King2018-10-101-41/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba90611225 Help: Make synopsis of if command more compact; add section headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2451
| * | | | | | | | Help: Make synopsis of if command more compact; add section headersJoachim Wuttke (l)2018-10-091-41/+49
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also replace 'expression' by 'condition' (as in the while command); relegate optional arguments of else() and endif() to the text; revise explanation of operator precedence in Condition Syntax section.
* | | | | | | | CMake Nightly Date StampKitware Robot2018-10-101-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'readme-build-docs'Brad King2018-10-091-1/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | af6f16f1e8 README: Explain how to build CMake with the docs ae80271ed3 README: Fix typo (rm space). Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2466
| * | | | | | | | README: Explain how to build CMake with the docsJoachim Wuttke (o)2018-10-091-0/+7
| | | | | | | | |
| * | | | | | | | README: Fix typo (rm space).Joachim Wuttke (o)2018-10-091-1/+1
| |/ / / / / / /
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-090-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | CMake 3.13.0-rc1v3.13.0-rc1Brad King2018-10-090-0/+0
| | | | | | | |
* | | | | | | | Merge branch 'release-3.13'Brad King2018-10-090-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'FindBISON-fix-verbose-file' into release-3.13Brad King2018-10-091-7/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2467
* | \ \ \ \ \ \ \ Merge topic 'FindBISON-fix-verbose-file'Brad King2018-10-091-7/+14
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | / / / / / | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | c64797fa94 FindBISON: Fix "multiple rules generate" error on VERBOSE output Acked-by: Kitware Robot <kwrobot@kitware.com> 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 'release-3.13'Brad King2018-10-090-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge branch 'string-TIMESTAMP-unset-TZ' into release-3.13Brad King2018-10-091-1/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2464
* | \ \ \ \ \ \ 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
| | | | | | |
generated by cgit v0.12 at 2025-01-11 20:45:01 (GMT)