summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Source: std::string related cleanupVitaly Stakhovsky2019-05-1518-91/+87
|
* Merge branch 'release-3.14'Brad King2019-05-140-0/+0
|\
| * CMake 3.14.4v3.14.4Brad King2019-05-141-1/+1
| |
* | Merge branch 'release-3.13'Brad King2019-05-140-0/+0
|\ \
| * | CMake 3.13.5v3.13.5Brad King2019-05-141-1/+1
| | |
* | | Merge branch 'release-3.14'Brad King2019-05-140-0/+0
|\ \ \ | | |/ | |/|
| * | Merge branch 'doc-relnotes-3.14' into release-3.14Brad King2019-05-142-0/+19
| |\ \ | | | | | | | | | | | | Merge-request: !3319
* | \ \ Merge branch 'release-3.13'Brad King2019-05-140-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'doc-relnotes-3.13' into release-3.13Brad King2019-05-141-0/+9
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3319
* | \ \ \ Merge topic 'doc-relnotes-3.14'Brad King2019-05-142-0/+19
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2aeba927c Help: Add 3.14.4 release notes 1d645e9891 Merge branch 'doc-relnotes-3.13' into doc-relnotes-3.14 d6b8822919 Help: Add 3.13.5 release notes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3319
| * | | | Help: Add 3.14.4 release notesBrad King2019-05-141-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a note about the fix in commit 3d3713121b (target_link_libraries: Fix static library private deps in other dirs, 2019-04-30). Also reference the equivalent note already added to the 3.13.5 notes.
| * | | | Merge branch 'doc-relnotes-3.13' into doc-relnotes-3.14Brad King2019-05-141-0/+9
| |\ \ \ \ | | | |/ / | | |/| / | | |_|/ | |/| |
| | * | Help: Add 3.13.5 release notesBrad King2019-05-141-0/+9
| | |/ | | | | | | | | | | | | Add a note about the fix in commit 3d3713121b (target_link_libraries: Fix static library private deps in other dirs, 2019-04-30).
* | | Merge topic 'find-boost-cmp0093'Brad King2019-05-1412-4/+55
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5108759ed2 FindBoost: Introduce CMP0093 to report Boost_VERSION in x.y.z format Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3317
| * | | FindBoost: Introduce CMP0093 to report Boost_VERSION in x.y.z formatDennis Klein2019-05-1312-4/+55
| | | | | | | | | | | | | | | | This aligns module mode behaviour with config mode.
* | | | Merge topic 'cmSytemTools_ExpandedList'Brad King2019-05-144-29/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cdff7f4e2a cmSystemTools: Add ExpandedListArgument and ExpandedLists methods Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3313
| * | | | cmSystemTools: Add ExpandedListArgument and ExpandedLists methodsSebastian Holtermann2019-05-134-29/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes ------- In `cmSystemTools` this - renames the method `ExpandList` to `ExpandLists` and makes it iterator based and adds the methods - `std::vector<std::string> ExpandedLists(InputIt first, InputIt last)` - `std::vector<std::string> ExpandedListArgument(const std::string& arg, bool emptyArgs)` Both return the `std::vector<std::string>` instead of taking a return vector reference like `cmSystemTools::ExpandLists` and `cmSystemTools::ExpandListArgument`. Motivation ---------- Since C++17 return value optimization is mandatory, so returning a `std:vector<std::string>` from a function should be (at least) as fast as passing a return vector reference to the function. The new methods can replace `cmSystemTools::ExpandLists` and `cmSystemTools::ExpandListArgument` in many cases, which leads to shorter and simpler syntax. E.g. the commonly used pattern ``` if (const char* value = X->GetProperty("A_KEY_STRING")) { std::vector<std::string> valuesList; cmSystemTools::ExpandListArgument(value, valuesList); for (std::string const& i : valuesList) { doSomething(i); } } ``` becomes ``` if (const char* value = X->GetProperty("A_KEY_STRING")) { for (std::string const& i : cmSystemTools::ExpandedListArgument(value)) { doSomething(i); } } ```
* | | | | Merge topic 'error-generate-step'Brad King2019-05-1429-28/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8cc04b1918 cmake: Display error if generate step fails Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !3304
| * | | | | cmake: Display error if generate step failsKyle Edwards2019-05-1329-28/+89
| |/ / / /
* | | | | Merge topic 'ninja_cleanups'Brad King2019-05-145-241/+223
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 054954d855 Ninja: Use clean target instead of clean tool in `cmake --target clean` calls 30a550d6ad Ninja: In cmNinjaTargetGenerator use std::unique_ptr to manage new instances 0024356f8e Ninja: In cmNinjaTargetGenerator optimize string composition 8691b3cf91 Ninja: Inline range loop range arguments 47da9859e8 Ninja: In cmGlobalNinjaGenerator use std::unique_ptr to manage output streams 9902702134 Ninja: Add and use cmGlobalNinjaGenerator::CMakeCmd method 12aa6fe07b Ninja: Fix message in cmGlobalNinjaGenerator::WriteBuild method 02293841e7 Ninja: Simplify cmGlobalNinjaGenerator::AddRule and HasRule methods ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3312
| * | | | | Ninja: Use clean target instead of clean tool in `cmake --target clean` callsSebastian Holtermann2019-05-132-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A convenience `clean` target for the Ninja generator exists since commit 3bd41f2eb5. It's safe to call `ninja clean` instead of `ninja -t clean`. This removes the exception mapping of the `clean` target in `cmake --build ... --target clean` calls to the Ninja `-t clean` tool.
| * | | | | Ninja: In cmNinjaTargetGenerator use std::unique_ptr to manage new instancesSebastian Holtermann2019-05-133-7/+9
| | | | | |
| * | | | | Ninja: In cmNinjaTargetGenerator optimize string compositionSebastian Holtermann2019-05-131-62/+78
| | | | | |
| * | | | | Ninja: Inline range loop range argumentsSebastian Holtermann2019-05-123-28/+14
| | | | | |
| * | | | | Ninja: In cmGlobalNinjaGenerator use std::unique_ptr to manage output streamsSebastian Holtermann2019-05-112-28/+31
| | | | | |
| * | | | | Ninja: Add and use cmGlobalNinjaGenerator::CMakeCmd methodSebastian Holtermann2019-05-102-46/+48
| | | | | |
| * | | | | Ninja: Fix message in cmGlobalNinjaGenerator::WriteBuild methodSebastian Holtermann2019-05-101-5/+3
| | | | | |
| * | | | | Ninja: Simplify cmGlobalNinjaGenerator::AddRule and HasRule methodsSebastian Holtermann2019-05-102-13/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use `std::unordered_set` for the emitted rule register - Use `std::unordered_map` for command length register
| * | | | | Ninja: Simplify cmGlobalNinjaGenerator::WriteRule methodSebastian Holtermann2019-05-101-45/+31
| |/ / / /
* | | | | Merge topic 'cminstallgenerator-compute-error'Brad King2019-05-1416-17/+28
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b133d14fb1 Refactor: Allow cmInstallGenerator::Compute() to return an error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3305
| * | | | | Refactor: Allow cmInstallGenerator::Compute() to return an errorKyle Edwards2019-05-1316-17/+28
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This is preparation for an upcoming merge request, which will add a new cmInstallGenerator that returns false if there are errors in the Compute() step.
* | | | | Merge topic 'relax_cxx_relaxed_constexpr_requirements'Brad King2019-05-145-13/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d156f8f5a2 CompileFeatures: Record when MSVC gained full CXX14 support 62dbe53a8a CompileFeatures: Record when Intel gained full CXX14 support 1ebb0d79fe CompileFeatures: Relax cxx_relaxed_constexpr compiler requirements Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3292
| * | | | | CompileFeatures: Record when MSVC gained full CXX14 supportRobert Maynard2019-05-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++14 feature support when the running compiler is known to have all features.
| * | | | | CompileFeatures: Record when Intel gained full CXX14 supportRobert Maynard2019-05-131-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the infrastructure added by commit 646fb1a646 (CompileFeatures: memoize C++ compilers with full language level support, 2019-03-27) to avoid using a `try_compile` to check for C++14 feature support when the running compiler is known to have all features.
| * | | | | CompileFeatures: Relax cxx_relaxed_constexpr compiler requirementsRobert Maynard2019-05-133-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This in effect means that cxx_relaxed_constexpr is now supported by MSVC and Intel 18.0-18.04.
* | | | | | Merge topic 'apple_clang_cxx_20_support'Brad King2019-05-142-1/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9523ca72e2 Features: Activate C++20 support for AppleClang 10.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3294
| * | | | | | Features: Activate C++20 support for AppleClang 10.0+Robert Maynard2019-05-072-1/+9
| | | | | | |
* | | | | | | Merge branch 'release-3.14'Brad King2019-05-140-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'swig4' into release-3.14Brad King2019-05-131-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3314
| * \ \ \ \ \ \ Merge branch 'ios-xctest-lookup' into release-3.14Brad King2019-05-133-0/+37
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3309
* | \ \ \ \ \ \ \ Merge topic 'swig4'Brad King2019-05-141-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65c5c1b567 FindSWIG: Support swig4.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3314
| * | | | | | | | FindSWIG: Support swig4.0Daniele E. Domenichelli2019-05-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'ios-xctest-lookup'Brad King2019-05-143-0/+37
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e9d128b789 Apple: Properly lookup XCTest for iOS and tvOS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3309
| * | | | | | | | Apple: Properly lookup XCTest for iOS and tvOSGregor Jasny2019-05-113-0/+37
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Closes: #19172
* | | | | | | | CMake Nightly Date StampKitware Robot2019-05-141-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'autorcc_timestamp'Brad King2019-05-133-59/+69
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15004e4319 AutoRcc: Simplify error logging with utility lambda bd6c3f8609 AutoRcc: Rebuild if the rcc executable is newer than its output 54903af84b AutoRcc: Don't read the info file time again 081104fb00 AutoRcc: Write re-generation reason and rcc command as one string eff6e622d6 Autogen: A missing info file is a critical error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3311
| * | | | | | | AutoRcc: Simplify error logging with utility lambdaSebastian Holtermann2019-05-111-20/+18
| | | | | | | |
| * | | | | | | AutoRcc: Rebuild if the rcc executable is newer than its outputSebastian Holtermann2019-05-112-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AUTORCC add a test if the rcc executable is newer that the rcc output. If the rcc executable is newer, rebuild the output.
| * | | | | | | AutoRcc: Don't read the info file time againSebastian Holtermann2019-05-111-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `AUTORCC` use the info file time that's available already instead of reading it again.
| * | | | | | | AutoRcc: Write re-generation reason and rcc command as one stringSebastian Holtermann2019-05-112-29/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In AUTORCC with verbose output write the rcc re-generation reason and the rcc command as on single string to avoid message chopping in concurrent builds.