summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'improve-documentation'Brad King2019-04-04134-343/+367
|\ | | | | | | | | | | | | 456e0fb64f Help: Improve documentation formating Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3174
| * Help: Improve documentation formatingBartosz Kosiorek2019-04-04134-343/+367
| |
* | Merge branch 'release-3.14'Brad King2019-04-040-0/+0
|\ \
| * \ Merge branch 'vs2019-redist' into release-3.14Brad King2019-04-042-10/+18
| |\ \ | | | | | | | | | | | | Merge-request: !3186
| * \ \ Merge branch 'armcc-compiler-id' into release-3.14Brad King2019-04-041-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3187
* | \ \ \ Merge topic 'armcc-compiler-id'Brad King2019-04-041-1/+1
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | f28e7fc1a5 ARMCC: Do not identify ARMClang as ARMCC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3187
| * | | | ARMCC: Do not identify ARMClang as ARMCCBrad King2019-04-031-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 8f8d056051 (ARMCC: Fix identification of ARM compiler when it defines GNU macros, 2019-03-20, v3.14.1~10^2) we consider ARMCC before Clang or GNU compilers. Since armclang also defines `__ARMCC_VERSION` it is now mistaken for ARMCC. Extend the check for ARMCC to also verify that `__clang__` is not defined. Issue: #19065
* | | | Merge topic 'vs2019-redist'Brad King2019-04-042-10/+18
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 33ee779330 IRSL: Fix discovery of VS 2019 v142 toolset redistributables d8cf8380fb MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3186
| * | | IRSL: Fix discovery of VS 2019 v142 toolset redistributablesBrad King2019-04-041-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since VS 2017's v141 toolset there is no longer a simple equation to calculate the redist name, dll version, and VS IDE version from just the MSVC toolset version. Refactor the logic to use hard-coded values and warn when a new version is not supported. Fixes: #19125
| * | | MSVC: Fix MSVC_TOOLSET_VERSION for VS 2019 v142 toolsetBrad King2019-04-031-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | This was forgotten in commit 626c51f47b (VS: Update for Visual Studio 2019 Preview 2, 2019-01-24, v3.14.0-rc1~74^2) when the toolset was first renumbered to `v142`. Issue: #19125
* | | Merge topic 'FindGLEW-lib-suffixes'Brad King2019-04-041-0/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 14c7396fb9 FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3179
| * | | FindGLEW: fix CMAKE_FIND_LIBRARY_SUFFIXESClaudio Fantacci2019-04-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FindGLEW temporarily changes the content of CMAKE_FIND_LIBRARY_SUFFIXES to look for static and dynamic GLEW library. However, it wasn't storing and restoring the initial content of such variable, causing possible issues in user project.
* | | | Merge topic 'FindBoost-clang-cl'Brad King2019-04-041-1/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d48bf97fd3 FindBoost: Consider boost suffixes suitable for clang-cl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3164
| * | | | FindBoost: Consider boost suffixes suitable for clang-clDouman2019-04-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | When compiling with `clang-cl` we can use either the MSVC- or Clang-built boost libraries.
* | | | | Merge topic 'pr.projectbefore'Brad King2019-04-048-0/+40
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0761186949 project: Add variable CMAKE_PROJECT_INCLUDE_BEFORE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3175
| * | | | | project: Add variable CMAKE_PROJECT_INCLUDE_BEFORERuslan Baratov2019-04-018-0/+40
| | | | | |
* | | | | | Merge topic 'modernize-raw-string-literal'Brad King2019-04-0422-61/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30bb14c657 Modernize: Enable modernize-raw-string-literal in clang-tidy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3184
| * | | | | | Modernize: Enable modernize-raw-string-literal in clang-tidyArtur Ryt2019-04-0222-61/+60
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'autogen_keywords_class'Brad King2019-04-046-75/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18f7b2ed21 Autogen: Add more frequently used keywords to Keywords class 5fb122ff75 Autogen: Add `AUTO*_EXECUTABLE` strings to Keywords class b32e18fb88 Autogen: Remove static const generator name strings from cmQtAutoGen 5431395d68 Autogen: Add cmQtAutogenGlobalInitializer::Keywords class 78eccc7836 Autogen: Remove lowercase generator name from generator variables class Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3182
| * | | | | | Autogen: Add more frequently used keywords to Keywords classSebastian Holtermann2019-04-023-26/+36
| | | | | | |
| * | | | | | Autogen: Add `AUTO*_EXECUTABLE` strings to Keywords classSebastian Holtermann2019-04-022-3/+10
| | | | | | |
| * | | | | | Autogen: Remove static const generator name strings from cmQtAutoGenSebastian Holtermann2019-04-024-37/+28
| | | | | | |
| * | | | | | Autogen: Add cmQtAutogenGlobalInitializer::Keywords classSebastian Holtermann2019-04-022-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new `cmQtAutogenGlobalInitializer::Keywords` class instance is bound to the lifetime of the `cmQtAutogenGlobalInitializer` instance. Global static const strings would be allocated at program start and deallocated at program end. Keeping keyword strings alive only in the context where they're needed helps to reduce the memory footprint.
| * | | | | | Autogen: Remove lowercase generator name from generator variables classSebastian Holtermann2019-04-021-11/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | The lowercase `Auto*` generator name in `cmQtAutoGenInitializer::GenVarsT` is never user. Remove it from the class.
* | | | | | 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 `//!`.