summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.13.0-rc2v3.13.0-rc2Brad King2018-10-251-1/+1
|
* Merge branch 'cmake-gui-vs-open-space' into release-3.13Brad King2018-10-251-2/+3
|\ | | | | | | Merge-request: !2524
| * cmake-gui: Fix "Open Project" for VS IDE with space in pathBrad King2018-10-251-2/+3
| | | | | | | | | | | | Do not encode the path for a shell until after we check that it exists. Fixes: #18501
* | Merge branch 'cuda-thread-flags' into release-3.13Brad King2018-10-241-1/+18
|\ \ | | | | | | | | | Merge-request: !2512
| * \ Merge branch 'cuda-filter-device-link-items' into cuda-thread-flagsBrad King2018-10-241-1/+18
| |\ \
| | * | CUDA: Filter out host link flags during device linkingRobert Maynard2018-10-241-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.12.0-rc1~278^2 (CUDA: Pass more link libraries to device linking, 2018-03-27) we consider every link item during device linking. However, items that start in `-` may be host-specific link flags that nvcc will not understand during device linking. Filter such items using a white list. In particular, this allows `-pthread` to be used for host linking while not polluting the device link line. Issue: #18008
* | | | Merge branch 'tar-warnings' into release-3.13Brad King2018-10-241-13/+31
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !2519
| * | | | cmake: Distinguish '-E tar' warnings from errors copying dataBrad King2018-10-241-13/+31
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The logic added by commit v3.12.0-rc1~62^2 (cmake: Teach '-E tar' to report errors copying data, 2018-05-16) incorrectly reports failure in the case of ARCHIVE_WARN. Convert this case to a warning. Fixes: #18496
| * | | CMake 3.12.3v3.12.3Brad King2018-10-031-1/+1
| | | |
| * | | Merge branch 'fix-csharp-target-type' into release-3.12Brad King2018-10-023-6/+12
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2427
| * \ \ \ Merge branch 'fix-ctest_start-track' into release-3.12Brad King2018-09-101-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2366
* | \ \ \ \ Merge branch 'vs-csharp-win32-flags' into release-3.13Brad King2018-10-235-10/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2516
| * | | | | | VS: Fix CSharp support for win32res: and win32icon: flagsBrad King2018-10-235-10/+10
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing `:` to these entries in the flag table. The user value is always required and must come after the `:`. Fixes: #18486
* | | | | | Merge branch 'vs-csharp-in-custom-target' into release-3.13Brad King2018-10-231-0/+4
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | Merge-request: !2515
| * | | | | VS: Fix crash on CSharp sources in a custom targetBrad King2018-10-231-0/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target generator does not compute ClOptions for custom targets, so we should not use them either. Fixes: #18377, #18485
* | | | | 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)
* | | | | Merge branch 'revert-server-iface-sources' into release-3.13Brad King2018-10-183-182/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2495
| * | | | | cmake-server: Revert "Support codemodel filegroups for INTERFACE_SOURCES"Brad King2018-10-173-182/+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 'backport-revert-install-code-script-genex' into release-3.13Brad King2018-10-112-44/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2474
| * | | | | install: Revert CODE,SCRIPT support for generator expressionsBrad King2018-10-112-44/+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-101-7/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | 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
* | | | | 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 '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 'project-always-set-desc-url' into release-3.13Brad King2018-10-081-12/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2457
| * | | | | project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are setCraig Scott2018-10-071-12/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge branch 'misc-typos' into release-3.13Brad King2018-10-043-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !2440
| * | | | | Fix misc. typosluz.paz2018-10-033-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ```
* | | | | CMake 3.13.0-rc1 version updateBrad King2018-10-031-3/+3
|/ / / /
* | | | 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.
* | | | | Merge topic 'update-kwsys'Brad King2018-10-031-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0da3340b9c Merge branch 'upstream-KWSys' into update-kwsys b6a689c6f8 KWSys 2018-10-03 (9d6873b1) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2437
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-10-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-10-03 (9d6873b1)
* | | | | | Merge topic 'fix-csharp-target-type'Brad King2018-10-033-6/+12
|\ \ \ \ \ \ | |/ / / / / |/| | | | / | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | 375b420fdf CSharp: Fix regression in VS project type selection 8b21aa0af0 VS: Fix CSharp flag selection when linking to a static C++ library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2427
| * | | | CSharp: Fix regression in VS project type selectionBrad King2018-10-022-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A that target contains only `.cs` sources should be generated as a `.csproj` project even if it links to non-CSharp static libraries. The latter case was broken by refactoring in commit v3.12.0-rc1~160^2~7 (remove TargetIsCSharpOnly() and use methods from cmGeneratorTarget, 2018-03-19). The reason is that the `HasLanguage` method added by commit v3.12.0-rc1~239^2~6 (cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages(), 2018-03-19) enforces its "exclusive" check on the combined set of source file languages and the link language. To restore the original `TargetIsCSharpOnly` semantics, update `HasLanguage` to enforce exclusiveness only on the list of sources. Fixes: #18239
| * | | | VS: Fix CSharp flag selection when linking to a static C++ libraryBrad King2018-10-021-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CSharp target links to a static C++ library, CMake will compute the link language as C++ instead of CSharp. That may be incorrect and needs further investigation, but it does not affect how VS drives C# linking. However, it does break our flag language selection logic and causes C++ flags to be used for CSharp. In particular, this drops the `-platform:x86` flag on 32-bit builds. Fix this by always selecting the CSharp flags when generating a `.csproj` project type. Issue: #18239
* | | | | CMake Nightly Date StampKitware Robot2018-10-031-1/+1
| | | | |
* | | | | Merge topic 'csharp_versions'Brad King2018-10-021-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 94c406eb49 VS: Update CSharp flag table to support new language versions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2425
| * | | | | VS: Update CSharp flag table to support new language versionsDean Glazeski2018-10-011-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based off of the latest 15.8.5 release of VS 2017. CSC version 2.9.0.63208 (958f2354).
* | | | | | Merge topic 'install-directory-permissions-fix'Brad King2018-10-021-18/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e61b79b82 install: Set permissions on directories created by install(DIRECTORY) fbd89b6753 Help: Add note about CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2428
| * | | | | | install: Set permissions on directories created by install(DIRECTORY)Kyle Edwards2018-10-011-18/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The directories that are implicitly created by install(DIRECTORY) were not having their permissions being set by CMAKE_INSTALL_DEFAULT_DIRECTORY_PERMISSIONS. This change refactors cmFileCopier to take this into account for directory installation.
* | | | | | | CMake Nightly Date StampKitware Robot2018-10-021-1/+1
|/ / / / / /
* | | | | | Merge topic 'no_buildid_for_files'Brad King2018-10-011-20/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c49d13f94b ctest: only create buildid when submitting from Testing/ dir Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2423
| * | | | | | ctest: only create buildid when submitting from Testing/ dirZack Galbreath2018-09-281-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 7f530cc we taught CTest to pass extra information to CDash at submit time. This extra info is used by CDash to initialize a buildid. `ctest_submit(FILES)` can be used to send specific files to CDash. These files are not necessarily associated with the build currently being performed. For this reason, we modify the behavior of ctest_submit() to only specify this extra info when we are submitting files from the current build's Testing directory.
* | | | | | | Merge topic 'byproducts_make_clean'Brad King2018-10-011-0/+30
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 80e2f8ee0c Ninja,Makefile: Add tests for handling of byproducts by clean operations c7f1ed03d7 Help: Add release note for make clean and byproducts 4220962d18 Makefile: Add build events byproducts to clean rules 182d9597ec Makefile: Add custom command byproducts to clean rules 9c2b393cb7 Tests: Update CustomCommandWorkingDirectory to handle in-source byproducts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2334
| * | | | | | Makefile: Add build events byproducts to clean rulesPedro Navarro2018-09-281-0/+24
| | | | | | |
generated by cgit v0.12 at 2025-01-14 20:05:17 (GMT)