summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPython-handle-virtual-env'Brad King2019-04-0410-20/+198
|\ | | | | | | | | | | | | 8a2f62cc18 FindPython*: Add capability to control virtual env handling. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3173
| * FindPython*: Add capability to control virtual env handling.Marc Chevrier2019-04-0310-20/+198
| | | | | | | | Fixes: #19097
* | Merge topic 'remove_duplicates'Brad King2019-04-0413-1/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | abbb8a7b1d Genex: Add $<REMOVE_DUPLICATES:list> 11338389e5 Help: Fix description in cmake-generator-expressions(7) manual Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3154
| * | Genex: Add $<REMOVE_DUPLICATES:list>Sebastian Lipponer2019-04-0113-0/+82
| | |
| * | Help: Fix description in cmake-generator-expressions(7) manualSebastian Lipponer2019-04-011-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2019-04-041-1/+1
| | |
* | | Merge topic 'refactor-lang-flags'Brad King2019-04-034-19/+17
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 707283981f VS: Use AddLanguageFlags to de-duplicate CMAKE_<LANG>_FLAGS* lookup 8ca1b26286 cmLocalGenerator: Factor IPO logic out of AddLanguageFlags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3177
| * | | VS: Use AddLanguageFlags to de-duplicate CMAKE_<LANG>_FLAGS* lookupBrad King2019-04-022-16/+3
| | | |
| * | | cmLocalGenerator: Factor IPO logic out of AddLanguageFlagsBrad King2019-04-022-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | The IPO flag logic was added to `AddLanguageFlags` based on my advice. However, this method should really only be about `CMAKE_<LANG>_FLAGS*` variables. Move the IPO logic out to its call sites.
* | | | Merge topic 'find-dependency-fix-17583'Brad King2019-04-035-27/+60
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 37da6af17d find_dependency: Always search dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3161
| * | | | find_dependency: Always search dependenciesDamien R2019-03-295-27/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a dependency was already found, find_dependency did not search it again. While this works in basic case, it does not when there are components as the check does not take components into account. Given the fact that there is no documentation about this optimization and that the correct implementation is not trivial as it would require changes in find_package to have the list of components already found we always search dependencies. Fix #17583.
* | | | | CMake Nightly Date StampKitware Robot2019-04-031-1/+1
| | | | |
* | | | | Merge topic 'nasm-fix'Brad King2019-04-021-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e4de543d0 Modules: Check nasm compile object variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3167
| * | | | | Modules: Check nasm compile object variableConnor Davis2019-03-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the CMAKE_ASM_NASM_COMPILE_OBJECT variable is set before modifying it. Only modify if not previously set.
* | | | | | CMake Nightly Date StampKitware Robot2019-04-021-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'project-include'Brad King2019-04-019-15/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d19b3091d Release note for CMAKE_PROJECT_INCLUDE variable dda0190458 project: Add variable CMAKE_PROJECT_INCLUDE 390f14a244 Test ProjectInclude: Add NONE to avoid enabling languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3155
| * | | | | Release note for CMAKE_PROJECT_INCLUDE variableRuslan Baratov2019-03-291-0/+5
| | | | | |
| * | | | | project: Add variable CMAKE_PROJECT_INCLUDERuslan Baratov2019-03-277-14/+52
| | | | | |
| * | | | | Test ProjectInclude: Add NONE to avoid enabling languagesRuslan Baratov2019-03-271-1/+1
| | | | | |
* | | | | | Merge topic 'refactor-cmcmd'Brad King2019-04-012-83/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f13aef4de5 cmcmd: Modernize for loops with cmMakeRange e9bbfdd9a1 cmcmd: Pass args vector by const& Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3168
| * | | | | | cmcmd: Modernize for loops with cmMakeRangeArtur Ryt2019-03-301-66/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Also minor loop variable renaming
| * | | | | | cmcmd: Pass args vector by const&Artur Ryt2019-03-302-17/+18
| | | | | | |
* | | | | | | Merge topic 'utilize-substr'Brad King2019-04-0112-22/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d66567dca Modernize: Prefer .substr in place of .c_str() + int Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@xwmw.org> Merge-request: !3169
| * | | | | | | Modernize: Prefer .substr in place of .c_str() + intArtur Ryt2019-03-3012-22/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of temporary/local strings were created out of C-strings substr can utilize current string size, so in theory be a little more efficient.
* | | | | | | Merge topic 'fix_doxygen_comments'Brad King2019-04-0143-180/+180
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 735c6f39d9 Fix invalid ///! doxygen comment line starts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3170
| * | | | | | | Fix invalid ///! doxygen comment line startsSebastian Holtermann2019-03-3143-180/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In various places `///!` was used to start a comment line. This is not valid Doygen syntax. This patch replaces `///!` comment starts with `//!`.
* | | | | | | | Merge topic 'cmDepends_tweaks'Brad King2019-04-0111-121/+116
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87341d8328 cmDepends: Define DependencyMap instead of DependencyVector 5a15c9e7cb cmDepends: Refactor cmDepends::CheckDependencies method 5f6c236481 cmFiletimeCache: Add cmFiletimeCache::Remove method 18c30786a9 cmFileTime: Make cmFileTime::Compare method const Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3156
| * | | | | | | | cmDepends: Define DependencyMap instead of DependencyVectorSebastian Holtermann2019-03-278-36/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In `cmDepends` use `typedef std::map<std::string, std::vector<std::string>> DependencyMap` instead of defining a `class DependencyVector : public std::vector<std::string>` and using it in `std::map<std::string, DependencyVector>`. Since `std::map<std::string, std::vector<std::string>>` is used in various other places, we now reuse all of it's auto generated methods. This doesn't happen when we use `DependencyVector` in a `std::map`, because it is a different class than `std::vector<std::string>`.
| * | | | | | | | cmDepends: Refactor cmDepends::CheckDependencies methodSebastian Holtermann2019-03-272-78/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the following issues in `cmDepends::CheckDependencies`: - Use the `std::string` based `std::getline` interface to read lines from a file instead of using raw reads into raw buffers. - To reduce the file system access, we load file times only once from `cmFileTimeCache` and keep them on the stack for later comparison. - When a file is removed from the file system we remove it from the `cmFileTimeCache` as well.
| * | | | | | | | cmFiletimeCache: Add cmFiletimeCache::Remove methodSebastian Holtermann2019-03-272-6/+16
| | | | | | | | |
| * | | | | | | | cmFileTime: Make cmFileTime::Compare method constSebastian Holtermann2019-03-271-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'memorize_c_compilers_with_full_standard_support'Brad King2019-04-0111-3/+59
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 983533a4b8 Record when C compilers have gained full support for 90,99,11 f92ccbc306 CompileFeatures: memoize C compilers with full language level support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3146
| * | | | | | | | | Record when C compilers have gained full support for 90,99,11Robert Maynard2019-03-279-0/+30
| | | | | | | | | |
| * | | | | | | | | CompileFeatures: memoize C compilers with full language level supportRobert Maynard2019-03-272-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously compilers that had full support for a language standard level was forced to verify this every time a new build directory was created. Now we record this information and insert the correct granular compile features instead of doing a try_compile.
* | | | | | | | | | Merge topic 'allow_aliasing_unkown_targets'Brad King2019-04-014-5/+23
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d5872a396 add_library: Now support aliasing unknown import targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3148
| * | | | | | | | | | add_library: Now support aliasing unknown import targetsRobert Maynard2019-03-264-5/+23
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18327
* | | | | | | | | | Merge topic 'bug/missed-return-on-cli-errors'Craig Scott2019-04-011-2/+3
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99698ee351 cmake: Fix missed `return` statement when CLI errors found Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3171
| * | | | | | | | | cmake: Fix missed `return` statement when CLI errors foundAlex Turbov2019-03-311-2/+3
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-04-011-1/+1
|/ / / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2019-03-311-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2019-03-301-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge branch 'release-3.14'Brad King2019-03-290-0/+0
|\ \ \ \ \ \
| * | | | | | CMake 3.14.1v3.14.1Brad King2019-03-291-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.14'Brad King2019-03-290-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'implicit-includes' into release-3.14Brad King2019-03-2917-72/+92
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3157
| * \ \ \ \ \ \ Merge branch 'implicit-includes-autogen' into release-3.14Brad King2019-03-291-8/+13
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3159
| * \ \ \ \ \ \ \ Merge branch 'ifw_group_option_parsing' into release-3.14Brad King2019-03-291-0/+6
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3160
| * \ \ \ \ \ \ \ \ Merge branch 'backport-kwsys-SystemTools-copy-self' into release-3.14Brad King2019-03-271-4/+4
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3145
* | \ \ \ \ \ \ \ \ \ Merge topic 'implicit-includes'Brad King2019-03-2917-72/+92
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dad86f1873 ParseImplicitIncludeInfo: Canonicalize implicit include dirs Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michel Zou <xantares09@hotmail.com> Merge-request: !3157
| * | | | | | | | | | ParseImplicitIncludeInfo: Canonicalize implicit include dirsBrad King2019-03-2917-72/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implicit include directory extraction added by commit 5990ecb741 (Compute implicit include directories from compiler output, 2018-12-07, v3.14.0-rc1~108^2) leaves paths like `/usr/lib/../include` unchanged. Fix the logic to canonicalize such paths (e.g. to `/usr/include`) as we do for implicit link directories already. This is important to ensure the set of implicit directories is represented in the same form as the include directories that will be compared to them. Issue: #19095