summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'curl-ssize_t' into release-3.13Brad King2018-10-221-0/+6
|\ | | | | | | Merge-request: !2513
| * curl: add missing type sizes for 'long long' and '__int64'Brad King2018-10-221-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | When generating `curl_config.h`, add size information for `long long` and `__int64` types. These are needed as candidates for defining the `ssize_t` type because on MSVC, `long` is not the same size as `size_t`. This problem did not affect upstream curl because it computes the `ssize_t` type in CMake code where all sizes are available. CMake's port computes it in preprocessor logic because universal binaries on macOS do not know type sizes until compile time. Fixes: #18477
* | Merge branch 'update-kwsys' into release-3.13Brad King2018-10-192-1/+6
|\ \ | | | | | | | | | Merge-request: !2506
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-192-1/+6
| |\ \ | | |/ | |/| | | | | | | * upstream-KWSys: KWSys 2018-10-19 (c2f29d2e)
| | * KWSys 2018-10-19 (c2f29d2e)KWSys Upstream2018-10-192-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c2f29d2e929e58e36b4986d3ff5364a0d825cfca (master). Upstream Shortlog ----------------- Ben Boeckel (1): a5caf8a4 cmake: support an alias target Modestas Vainius (1): 162b3ed7 SystemInformation: Fix compilation on GNU/{kFreeBSD,Hurd}
* | | Merge branch 'deployqt4-cmp0080-fix' into release-3.13Brad King2018-10-192-368/+384
|\ \ \ | | | | | | | | | | | | Merge-request: !2494
| * | | DeployQt4: Do not include BundleUtilities at configure timeKyle Edwards2018-10-192-71/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to CMP0080, BundleUtilities can no longer be included at configure-time. However, DeployQt4 contains some functions which are meant to be used at configure-time, and some which are meant to be used at install-time and use BundleUtilities. This change breaks the file into two sections: common functions and install-time functions. BundleUtilities is now only included at install-time, thus fixing the policy warning. Fixes: #18466
| * | | DeployQt4: Convert to 2-space indentationKyle Edwards2018-10-181-259/+259
| | | |
| * | | Help: Convert DeployQt4 to block-style commentKyle Edwards2018-10-181-100/+101
| | | |
* | | | Merge branch 'doc-target_link_libraries-item-quoting' into release-3.13Brad King2018-10-181-0/+12
|\ \ \ \ | |/ / / |/| | | | | | | Merge-request: !2503
| * | | Help: Clarify command-line encoding of target_link_libraries itemsBrad King2018-10-181-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Items that have full paths will be quoted automatically. Other items are treated as command-line string fragments and get no automatic escaping. Document the behavior for each item kind. Fixes: #18467
* | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-182-106/+2148
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2500
| * \ \ \ Merge branch 'upstream-vim-cmake-syntax' into update-vim-syntaxBrad King2018-10-182-106/+2148
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-vim-cmake-syntax: vim-cmake-syntax 2018-10-18 (64ff4bd7)
| | * | | | vim-cmake-syntax 2018-10-18 (64ff4bd7)vim-cmake-syntax upstream2018-10-182-106/+2148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/pboettch/vim-cmake-syntax.git at commit 64ff4bd793c247da5a1772fffad91378dddf03b9 (master). Upstream Shortlog ----------------- Patrick Boettcher (1): 64ff4bd7 break line after each high-lighting keyword
* | | | | | Merge branch 'rel-doc-qthelp' into release-3.13Brad King2018-10-182-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2497
| * | | | | | Utilities/Release: Add qthelp docs to binary archivesBrad King2018-10-172-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18465
* | | | | | | Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-184-189/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2495
| * | | | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"Brad King2018-10-174-189/+40
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.13.0-rc1~144^2 (cmake-server: Support codemodel filegroups for INTERFACE_SOURCES, 2018-08-10). The changes activate code paths not meant to be used with interface libraries. Another approach will be needed to expose this information later. This revert has to be done by hand because the code in question has been changed somewhat since the changes were made, and was also factored out to another source file. Fixes: #18463
* | | | | | | Merge branch 'document-dollar-in-varnames' into release-3.13Brad King2018-10-168-2/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2479
| * | | | | | | CMP0053: document that `$` is a valid literal variable characterBen Boeckel2018-10-158-2/+48
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was overlooked in the initial implementation of CMP0053. However, an additional policy to reject it again is not worth it. Instead, add tests and document the behavior. Fixes: #17883
* | | | | | | Merge branch 'update_debug_target_properties' into release-3.13Brad King2018-10-151-7/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2480
| * | | | | | | Help: document CMAKE_DEBUG_TARGET_PROPERTIES support for LINK propertiesRobert Maynard2018-10-121-7/+16
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'FindPkgConfig-operator-docs' into release-3.13Brad King2018-10-151-6/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2481
| * | | | | | | FindPkgConfig: Document support for > and < operatorsCraig Scott2018-10-151-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was left out of commit v3.13.0-rc1~14^2 (FindPkgConfig: support also > and < operators for version compares, 2018-10-02).
* | | | | | | | Merge branch 'FindBoost-mt-release' into release-3.13Brad King2018-10-111-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2475
| * | | | | | | | FindBoost: Search for -mt variant of release libsMario Bielert2018-10-111-0/+1
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were searching the `-mt` variant for debug libs only. It makes sense for release libs too.
* | | | | | | | Merge branch 'FindPython-updates' into release-3.13Brad King2018-10-112-2/+77
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2476
| * | | | | | | | FindPython*: Add missing registry pathsMarc Chevrier2018-10-112-2/+77
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18443
* | | | | | | | Merge branch 'backport-revert-install-code-script-genex' into release-3.13Brad King2018-10-1110-70/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2474
| * | | | | | | | install: Revert CODE,SCRIPT support for generator expressionsBrad King2018-10-1110-70/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.13.0-rc1~441^2 (install: Teach CODE,SCRIPT modes to evaluate generator expressions, 2018-05-29). Unfortunately it has been found to break existing code in a real project, e.g. install(CODE [[ message("$<FOOBAR>") ]]) Address this regression by reverting support for the 3.13 release series. Support can be restored later with a policy for compatibility. Issue: #15785 Fixes: #18435
* | | | | | | | Merge branch 'vs-cuda-pdb' into release-3.13Brad King2018-10-1015-21/+32
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | Merge-request: !2473
| * | | | | | | VS: Add workaround for CUDA compiler PDB location with spaceBrad King2018-10-101-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CUDA Toolkit Visual Studio Integration for version 9.2 and above does honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to invoke `cl`. Unfortunately it does not quote paths with spaces correctly: -Xcompiler "... /Fd"C:\path\with space\foo.pdb" ..." Work around this by converting the PDB location to a relative path. Likely we could always do this, but for now make a minimal change just for CUDA support. Fixes: #18440
| * | | | | | | VS: Drop workaround for CUDA compiler PDB location on CUDA 9.2+Brad King2018-10-101-7/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The workaround added by commit v3.12.0-rc1~227^2 (VS: Add workaround for CUDA compiler PDB location, 2018-04-13) is not necessary on CUDA 9.2+ because the CUDA Toolkit Visual Studio Integration has fixed the original bug and forwards the `ProgramDataBaseFileName` to the host compiler itself. Make the workaround conditional on the CUDA version. Issue: #18440
| * | | | | | | Tests: Fix Cuda test project namesBrad King2018-10-1014-14/+14
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make them match what `ADD_TEST_MACRO` gives to ctest as the project name to build so that the `.sln` file will be found.
* | | | | | | Merge branch 'update-vim-syntax' into release-3.13Brad King2018-10-102-44/+118
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | 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
* | | | | | CMake 3.13.0-rc1v3.13.0-rc1Brad King2018-10-090-0/+0
| | | | | |
* | | | | | 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
generated by cgit v0.12 at 2025-01-09 19:24:39 (GMT)