summaryrefslogtreecommitdiffstats
path: root/Source/cmIfCommand.cxx
Commit message (Collapse)AuthorAgeFilesLines
* cmListFileCache: Make cmListFileFunction a shared pointerOleksandr Koval2020-10-011-11/+12
| | | | | Passing cmListFileFunction everywhere by-value involves big overhead. Now cmListFileFunction stores std::shared_ptr to the underlying data.
* cmConditionEvaluator: Remove extra copy of execution contextBrad King2020-09-281-8/+2
| | | | | | The execution context passed to the constructor always matches the top of the backtrace, so the former can be removed in favor of using only the latter.
* if,while: Clarify condition backtrace constructionBrad King2020-09-281-7/+9
| | | | | | | | | | | Evaluation of the `elseif`, `else`, and `while` commands takes place during function blocker evaluation before any actual command execution takes place. Therefore they do not have an entry in the backtrace stack. Each of their implementations needs to construct an extra backtrace entry to use in error messages and such. Each of them used a slightly different approach due to evolution over time. Clean up their construction of the extra backtrace entry and use a named variable to contain it for clarity.
* cmMakefile: Inline GetExecutionContext at call sitesBrad King2020-09-281-1/+1
| | | | | The method only had one line, and its implementation is more clear at the call sites than the method name.
* Refactoring: rename "cm_static_string_view.hxx" as <cmext/string_view>Marc Chevrier2020-04-301-2/+1
|
* Revise include order using clang-format-6.0Kitware Robot2019-10-011-3/+3
| | | | | Run the `clang-format.bash` script to update our C and C++ code to a new include order `.clang-format`. Use `clang-format` version 6.0.
* cmstd: Modernize CMake system headersMarc Chevrier2019-09-201-2/+3
| | | | | | | | | | | | | | Provide a standardized way to handle the C++ "standard" headers customized to be used with current CMake C++ standard constraints. Offer under directory `cm` headers which can be used as direct replacements of the standard ones. For example: #include <cm/string_view> can be used safely for CMake development in place of the `<string_view>` standard header. Fixes: #19491
* Source sweep: Use cmStrCat for string concatenationSebastian Holtermann2019-08-221-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch is generated by a python script that uses regular expressions to search for string concatenation patterns of the kind ``` std::string str = <ARG0>; str += <ARG1>; str += <ARG2>; ... ``` and replaces them with a single `cmStrCat` call ``` std::string str = cmStrCat(<ARG0>, <ARG1>, <ARG2>, ...); ``` If any `<ARGX>` is itself a concatenated string of the kind ``` a + b + c + ...; ``` then `<ARGX>` is split into multiple arguments for the `cmStrCat` call. If there's a sequence of literals in the `<ARGX>`, then all literals in the sequence are concatenated and merged into a single literal argument for the `cmStrCat` call. Single character strings are converted to single char arguments for the `cmStrCat` call. `std::to_string(...)` wrappings are removed from `cmStrCat` arguments, because it supports numeric types as well as string types. `arg.substr(x)` arguments to `cmStrCat` are replaced with `cm::string_view(arg).substr(x)`
* cmExecutionStatus: Remove function ClearRegina Pfeifer2019-08-061-2/+1
|
* cmFunctionBlocker: Recycle functionsRegina Pfeifer2019-07-311-4/+3
|
* cmFunctionBlocker: Move check for matching argsRegina Pfeifer2019-07-301-12/+6
|
* cmFunctionBlocker: Move common logic to baseRegina Pfeifer2019-07-301-37/+6
|
* cm*FunctionBlocker: Extract function ReplayRegina Pfeifer2019-07-301-104/+114
|
* cm*FunctionBlocker: Move to source fileRegina Pfeifer2019-07-301-0/+17
|
* cmCommand: De-virtualize function InvokeInitialPassRegina Pfeifer2019-07-211-8/+9
|
* cmCommand: deprecate functions GetMakefile and SetErrorDaniel Pfeifer2019-07-211-1/+1
| | | | | | | | | Replace the members for the Makefile and the Error with a cmExecutionStatus. Re-implement GetMakefile and SetError based on that. Both functions should be called directly on the cmExecutionStatus that is passed to InitialPass. This will help us make all Commands immutable and remove the need for cloning.
* cmMakefile: Modernize AddFunctionBlocker method to accept a std::unique_ptrSebastian Holtermann2019-07-171-8/+14
|
* modernize: manage cmCommand instances using unique_ptr.Marc Chevrier2019-07-141-2/+0
|
* IWYU: Fix handling of <memory> standard headerBrad King2019-07-101-1/+1
| | | | | | | | An old workaround for `std::allocator_traits<>::value_type` lints from IWYU on `std::vector<>` usage breaks IWYU's handling of `<memory>`. Convert the workaround to use the same approach we already use for a workaround of `std::__decay_and_strip<>::::__type` lints. Then update the `<memory>` inclusions to follow the now-correct IWYU lints.
* Factor out enum MessageType into dedicated headerBruno Manganelli2019-01-161-7/+8
| | | | Reduce the number of files relying on `cmake.h`.
* clang-tidy: fix warnings from version 7Regina Pfeifer2018-11-201-1/+1
| | | | | Fix some warnings that are new since clang-tidy version 4, and update `.clang-tidy` to suppress the rest.
* Revise implementation of case-insensitive command namesFlorian Jacomme2018-05-221-9/+7
| | | | | | | | | | | | | | | | | | | | Store both the as-written and lower-case command names and use the latter to avoid case-insensitive string comparisons. With this I obtain 2-6% speed increase (on Windows) for the configure step with no significant changes in memory usage. A case-insensitive comparison is a lot slower than just calling `==` because the operator will use things like memcmp, so prefer the latter. The `cmSystemTools::LowerCase` function allocates a new string each time it is called, so before this change we were allocating in: * cmMakefile::Configure two times for each function (to look for `cmake_minimum_required` and `project`) * cmMakefile::ExecuteCommand twice by function by calling cmState::GetCommand and copying the name Now we are only allocating once by function instead of four.
* Retire std::auto_ptr and its macro CM_AUTO_PTRMatthias Maennich2017-09-251-2/+4
| | | | Signed-off-by: Matthias Maennich <matthias@maennich.net>
* Meta: modernize old-fashioned loops to range-based `for`.Pavel Solodovnikov2017-09-121-21/+17
| | | | | | Changes done via `clang-tidy` with some manual fine-tuning for the variable naming and `auto` type deduction where appropriate.
* cmExecutionStatus: Remove arguments from settersDaniel Pfeifer2017-05-091-3/+3
| | | | | The setters are only used to set boolean values. The values are never reset individually.
* cmIfCommand: Reject duplicate else() and misplaced elseif()Gregor Jasny2017-03-221-0/+20
| | | | Closes: #14335
* Include necessary headers in commandsDaniel Pfeifer2016-10-261-7/+6
|
* Separate compilation for commands included in cmBootstrapCommands2Daniel Pfeifer2016-10-211-0/+1
|
* Simplify CMake per-source license noticesBrad King2016-09-271-11/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Per-source copyright/license notice headers that spell out copyright holder names and years are hard to maintain and often out-of-date or plain wrong. Precise contributor information is already maintained automatically by the version control tool. Ultimately it is the receiver of a file who is responsible for determining its licensing status, and per-source notices are merely a convenience. Therefore it is simpler and more accurate for each source to have a generic notice of the license name and references to more detailed information on copyright holders and full license terms. Our `Copyright.txt` file now contains a list of Contributors whose names appeared source-level copyright notices. It also references version control history for more precise information. Therefore we no longer need to spell out the list of Contributors in each source file notice. Replace CMake per-source copyright/license notice headers with a short description of the license and links to `Copyright.txt` and online information available from "https://cmake.org/licensing". The online URL also handles cases of modules being copied out of our source into other projects, so we can drop our notices about replacing links with full license text. Run the `Utilities/Scripts/filter-notices.bash` script to perform the majority of the replacements mechanically. Manually fix up shebang lines and trailing newlines in a few files. Manually update the notices in a few files that the script does not handle.
* Avoid else after returnDaniel Pfeifer2016-09-161-2/+1
|
* Avoid using KWSys auto_ptr by adopting it ourselvesBrad King2016-06-291-2/+1
| | | | | | | | | | | | Replace use of cmsys::auto_ptr with a CM_AUTO_PTR macro that maps to our own implementation adopted from the KWSys auto_ptr implementation. Later we may be able to map CM_AUTO_PTR to std::auto_ptr on compilers that do not warn about it. Automate the client site conversions: git grep -l auto_ptr -- Source/ | grep -v Source/kwsys/ | xargs sed -i \ 's|cmsys::auto_ptr|CM_AUTO_PTR|;s|cmsys/auto_ptr.hxx|cm_auto_ptr.hxx|'
* cmIfCommand: Don't rely on NestedError logic to issue messagesStephen Kelly2016-06-131-3/+3
|
* Revise C++ coding style using clang-formatKitware Robot2016-05-161-97/+64
| | | | | | | | | | | | | Run the `Utilities/Scripts/clang-format.bash` script to update all our C++ code to a new style defined by `.clang-format`. Use `clang-format` version 3.8. * If you reached this commit for a line in `git blame`, re-run the blame operation starting at the parent of this commit to see older history for the content. * See the parent commit for instructions to rebase a change across this style transition commit.
* Format include directive blocks and ordering with clang-formatBrad King2016-04-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort include directives within each block (separated by a blank line) in lexicographic order (except to prioritize `sys/types.h` first). First run `clang-format` with the config file: --- SortIncludes: false ... Commit the result temporarily. Then run `clang-format` again with: --- SortIncludes: true IncludeCategories: - Regex: 'sys/types.h' Priority: -1 ... Commit the result temporarily. Start a new branch and cherry-pick the second commit. Manually resolve conflicts to preserve indentation of re-ordered includes. This cleans up the include ordering without changing any other style. Use the following command to run `clang-format`: $ git ls-files -z -- \ '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' | egrep -z -v '(Lexer|Parser|ParserHelper)\.' | egrep -z -v '^Source/cm_sha2' | egrep -z -v '^Source/(kwsys|CursesDialog/form)/' | egrep -z -v '^Utilities/(KW|cm).*/' | egrep -z -v '^Tests/Module/GenerateExportHeader' | egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' | xargs -0 clang-format -i This selects source files that do not come from a third-party. Inspired-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
* Source: Stabilize include orderBrad King2016-04-291-0/+1
| | | | | Each source file has a logical first include file. Include it in an isolated block so that tools that sort includes do not move them.
* cmIfCommand: Simplify execution context constructionBrad King2016-04-151-8/+2
|
* cmConditionEvaluator: Remove GetConditionContext methodBrad King2016-03-291-4/+4
| | | | | All it does is call cmListFileContext::FromCommandContext, so move this to the call sites.
* Merge topic 'fix-CMP0054-elseif-warning'Brad King2015-10-211-2/+18
|\ | | | | | | | | d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
| * cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)Stephen Kelly2015-10-201-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop execution context in favor of a new way to create backtraces. However, a call to cmMakefile::GetExecutionContext is still invoked to issue a contextual CMP0054 warning through cmConditionEvaluator. As the elseif is not part of the call stack, this resulted in trying to access an empty vector. Avoid the attempt at getting execution context when evaluating elseif by constructing a context and backtrace on behalf of the cmConditionEvaluator in all cases.
* | Add cmOutputConverter include where needed.Stephen Kelly2015-10-051-0/+1
|/
* Port static calls from cmLocalGenerator to cmOutputConverter.Stephen Kelly2015-06-061-1/+1
|
* cmMakefile: Add API for elseif to create backtrace.Stephen Kelly2015-06-021-5/+2
|
* Don't use a cmLocalGenerator instance to call static methods.Stephen Kelly2015-05-141-5/+4
|
* if(): avoid one needless string compare for all if() statementsRolf Eike Beer2015-02-221-1/+1
| | | | If it's known that it is an "if" it can't be an "elseif".
* Replace foo.size() pattern with !foo.empty().Stephen Kelly2015-01-181-2/+2
|
* Replace 'foo.size() == 0' pattern with foo.empty().Stephen Kelly2015-01-181-1/+1
|
* continue: Add a new CMake language command for loop continuation (#14013)Gregor Jasny2014-12-011-0/+5
| | | | | Inspired-by: Doug Barbieri Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* If: Introduce policy CMP0054 - don't dereference quoted variables in if()Nils Gladitz2014-09-111-5/+5
|
* If: Extract cmConditionEvaluator from if() implementationNils Gladitz2014-09-111-701/+12
|
* ClearMatches: Only clear matches which were actually setBen Boeckel2014-04-291-2/+2
| | | | | | | ClearMatches was clearing many variables which were never set in the first place. Instead, store how many matches were made last time and only clear those. It is moved to the cmMakefile class since it is a common utility used by multiple commands.