summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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 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
| | | | |
| * | | | Makefile: Add custom command byproducts to clean rulesPedro Navarro2018-09-281-0/+6
| | | | |
* | | | | Merge topic 'add_progress_summary_console_logging_mode'Brad King2018-10-016-61/+198
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b3d5b8b3fb ctest: Add option for live progress summary in terminal 62fbe5002a cmCTestRunTest: Thread number of completed tests through start APIs 02c5091c90 cmCTestRunTest: Simplify number width computation 6a285bb737 cmCTestRunTest: Buffer test result output before printing Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2240
| * | | | ctest: Add option for live progress summary in terminalMichael Wegner2018-09-265-21/+162
| | | | |
| * | | | cmCTestRunTest: Thread number of completed tests through start APIsMichael Wegner2018-09-253-7/+8
| | | | |
| * | | | cmCTestRunTest: Simplify number width computationMichael Wegner2018-09-251-8/+2
| | | | | | | | | | | | | | | | | | | | Use a real logarithm implementation.
| * | | | cmCTestRunTest: Buffer test result output before printingMichael Wegner2018-09-251-28/+29
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-10-011-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-09-301-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-09-291-1/+1
| |/ / / |/| | |
* | | | Merge topic 'customcommandworkingdirectory'Brad King2018-09-282-1/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f158ac19e1 add_custom_{command,target}: WORKING_DIRECTORY generator expressions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2409
| * | | | add_custom_{command,target}: WORKING_DIRECTORY generator expressionsJon Chronopoulos2018-09-282-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This teaches add_custom_command and add_custom_target WORKING_DIRECTORY about generator expressions Fixes: #14089
* | | | | Merge topic 'vs-global-props-for-all-targets'Brad King2018-09-281-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36489b85aa VS: Add test for CMAKE_VS_GLOBALS 22e670a306 VS: Add option to set VS_GLOBAL_* for all targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2345
| * | | | | VS: Add option to set VS_GLOBAL_* for all targetsMikhail Korolev2018-09-251-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18287
* | | | | | Merge topic 'vs-msbuild-platform'Brad King2018-09-283-3/+18
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98e4fbdc06 VS: Pass platform when invoking MSBuild 6597428c36 ctest: Fix generator platform under --build-nocmake d8294fefe8 cmake: Fix generator platform under --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2413
| * | | | | VS: Pass platform when invoking MSBuildBrad King2018-09-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MSBuild expects a `/p:Platform=...` argument to tell it which platform to build among those in the `.vcxproj` files. We have not historically had to do this because we generate only one platform. However, when a project uses `include_external_msproject` the included project file may have other platforms. Fixes: #18308
| * | | | | ctest: Fix generator platform under --build-nocmakeBrad King2018-09-251-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When constructing a global generator instance in `--build-and-test` mode we need to set the platform passed by `--build-generator-platform` directly on the generator. The old code that set it on the `cmake` class instance did nothing because that only affects cache initialization, which is not done by `--build-nocmake`.
| * | | | | cmake: Fix generator platform under --build modeBrad King2018-09-251-0/+8
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-281-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-09-271-1/+1
| | | | | |
* | | | | | Merge topic 'refactor-backtrace'Brad King2018-09-262-3/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c8187f687 clang-tidy: restore 'misc-noexcept-move-constructor' 6c2af9d302 cmListFileCache: Add missing assertion in backtrace Top method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2415
| * | | | | | clang-tidy: restore 'misc-noexcept-move-constructor'Brad King2018-09-261-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We disabled this in commit 1fe0d72eb6 (clang-tidy: exclude 'misc-noexcept-move-constructor', 2018-09-24) due to false positives. Restore it and use a NOLINT comment to suppress them instead.
| * | | | | | cmListFileCache: Add missing assertion in backtrace Top methodBrad King2018-09-262-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can only get the top of a stack that has at least one call. Update the method's comment accordingly.
* | | | | | | Merge topic 'link-directories'Craig Scott2018-09-2628-68/+537
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9717725f9 link_directories(): enhance capabilities b5915744eb LINK_DIRECTORIES target property: add policy for absolute paths check. a71caab46b LINK_DIRECTORIES: Add new properties and commands 5ca130e223 Refactoring: introduce function to check if a string is a generator expression Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2403
| * | | | | | | link_directories(): enhance capabilitiesMarc Chevrier2018-09-256-8/+62
| | | | | | | |
| * | | | | | | LINK_DIRECTORIES target property: add policy for absolute paths check.Marc Chevrier2018-09-252-4/+32
| | | | | | | |
| * | | | | | | LINK_DIRECTORIES: Add new properties and commandsMarc Chevrier2018-09-2523-50/+434
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These new capabilities enable to manage link directories Two new properties: * target properties: LINK_DIRECTORIES and INTERFACE_LINK_DIRECTORIES One new command * target_link_directories(): to populate target properties Fixes: #17215
| * | | | | | | Refactoring: introduce function to check if a string is a generator expressionMarc Chevrier2018-09-254-12/+15
| | | | | | | |
* | | | | | | | Merge topic 'dbgsym-packaging'Brad King2018-09-262-384/+562
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d8a3939aef CPack/Deb: Add ability to split out debug symbols into .ddeb package 42fbff45e4 CPack/Deb: Use CMAKE_COMMAND to set the environment 66ab24a4c5 Help: Fix typo Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2399
| * | | | | | | | CPack/Deb: Add ability to split out debug symbols into .ddeb packageAndrew Fuller2018-09-212-384/+562
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-09-261-1/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge topic 'refactor-backtrace'Brad King2018-09-252-100/+90
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | 22aa6b67b4 cmListFileCache: Refactor cmListFileBacktrace internals 1fe0d72eb6 clang-tidy: exclude 'misc-noexcept-move-constructor' Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2410
| * | | | | cmListFileCache: Refactor cmListFileBacktrace internalsBrad King2018-09-242-100/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace use of raw pointers and explicit reference counting with `std::shared_ptr<>`. Use a discriminated union to store either the bottom level or a call/file context in each heap-allocated entry. This avoids storing a copy of the bottom in every `cmListFileBacktrace` instance and shrinks the structure to a single `shared_ptr`.