summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add tests for missing sources in add_executable and add_library.Deniz Bahadir2017-09-2059-0/+209
|
* Merge topic 'doc-RunCMake-result'Brad King2017-09-141-2/+2
|\ | | | | | | | | | | | | a7a6ae5e Tests: Update RunCMake/README.rst to clarify meaning of -result.txt Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1268
| * Tests: Update RunCMake/README.rst to clarify meaning of -result.txtBrad King2017-09-141-2/+2
|/ | | | | | | The content of `-result.txt` files is a regex, but the documentation didn't make this clear. Suggested-by: Deniz Bahadir <dbahadir@benocs.com>
* Merge branch 'release-3.9'Brad King2017-09-140-0/+0
|\
| * Merge branch 'backport-autogen-target-depends' into release-3.9Brad King2017-09-1312-72/+242
| |\ | | | | | | | | | Merge-request: !1257
| * \ Merge branch 'bootstrap-twice-in-source' into release-3.9Brad King2017-09-131-0/+6
| |\ \ | | | | | | | | | | | | Merge-request: !1258
| * \ \ Merge branch 'backport-vs-fix-config-map' into release-3.9Brad King2017-09-132-8/+20
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1256
* | \ \ \ Merge topic 'get_filename_component-fix-program-split'Brad King2017-09-145-1/+99
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31f73eb1 get_filename_component: Revise PROGRAM/PROGRAM_ARGS split semantics Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1251
| * | | | | get_filename_component: Revise PROGRAM/PROGRAM_ARGS split semanticsBrad King2017-09-135-1/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KWSys `SystemTools::SplitProgramFromArgs` implementation goes into an infinite loop when the value is just " " (a space). Since the "program path with unquoted spaces plus command-line arguments" operation it is trying to provide is poorly defined (string parsing should not depend on filesystem content), just stop using it. Instead consider the main two use cases the old approach tried to handle: * The value is the name or absolute path of a program with no quoting or escaping, but also no command-line arguments. In this case we can use the value as given with no parsing, and assume no arguments. * The value is a command-line string containing the program name/path plus arguments. In this case we now assume that the command line is properly quoted or escaped. Fixes: #17262
* | | | | | Merge topic 'remove-nmcl'Brad King2017-09-141-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c2cc91a4 Platforms: Remove Windows-NMcl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1255
| * | | | | | Platforms: Remove Windows-NMclChristian Pfeiffer2017-09-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.10~148^2~2 (Modernize MSVC compiler information files, 2012-08-23), the Windows-NMcl platform has been broken. It's most likely not needed anymore.
* | | | | | | Merge topic 'bootstrap-twice-in-source'Brad King2017-09-141-0/+6
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3deae71 bootstrap: Fix running multiple times in-source Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1258
| * | | | | | bootstrap: Fix running multiple times in-sourceBrad King2017-09-131-0/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~281^2 (Use quotes for non-system includes, 2017-04-11) we include `cmConfigure.h` via `""` instead of `<>`. This breaks the `bootstrap` script when run more than once in an in-source build. In that case `cmConfigure.h` is generated next to the source files that include it, so `""`-style includes prevent the `Bootstrap.cmk/cmConfigure.h` file from being included during bootstrap. Fix this by teaching the bootstrap script to remove any `cmConfigure.h` that may have been generated by an earlier run in an in-source build. Fixes: #17082
* | | | | | Merge topic 'vs-fix-config-map'Brad King2017-09-142-8/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 64e973e9 Merge branch 'backport-vs-fix-config-map' into vs-fix-config-map c5b5bb27 VS: Do not consider MAP_IMPORTED_CONFIG_<CONFIG> on non-imported targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1256
| * \ \ \ \ \ Merge branch 'backport-vs-fix-config-map' into vs-fix-config-mapBrad King2017-09-132-8/+20
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | VS: Do not consider MAP_IMPORTED_CONFIG_<CONFIG> on non-imported targetsBrad King2017-09-132-8/+20
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~309^2 (include_external_msproject: Honor MAP_IMPORTED_CONFIG_<CONFIG>, 2017-04-04) we accidentally honor `MAP_IMPORTED_CONFIG_<CONFIG>` while generating the `.sln` file entries for normal targets. This causes `devenv.com`-driven builds to use the mapping incorrectly for normal targets. Check that a target really comes from `include_external_msproject` before considering the map. Furthermore, when we do use the map, we should only take the first entry if more than one configuration is specified. Otherwise we end up giving VS a configuration name with a `;` in it. Fixes: #17276
* | | | | | Merge topic 'autogen-target-depends-fix-3-9-2'Brad King2017-09-140-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06c8a37e Merge branch 'backport-autogen-target-depends' into autogen-target-depends-fix-3-9-2 b494308d Autogen: Tests: Backport tests for _autogen target dependencies d0f15817 Autogen: Backport autogen target dependency as file dependency fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1257
| * \ \ \ \ \ Merge branch 'backport-autogen-target-depends' into ↵Brad King2017-09-130-0/+0
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | | | | | | | | | | | | autogen-target-depends-fix-3-9-2 Use the "ours" merge strategy because we already have equivalent changes on our side.
| | * | | | Autogen: Tests: Backport tests for _autogen target dependenciesSebastian Holtermann2017-09-1311-47/+182
| | | | | |
| | * | | | Autogen: Backport autogen target dependency as file dependency fixSebastian Holtermann2017-09-131-25/+60
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Target dependencies of the origin target were mistakenly forwarded to the _autogen target as *file* dependencies. This patch introduces proper distinction between *target* and *file* dependencies of the _autogen target. This patch also changes when PRE_BUILD is used for AUTOGEN in the Visual Studio generator. Formerly PRE_BUILD was disabled when the origin target depended on *any* other target. Now PRE_BUILD is only disabled if a dependency of the _autogen target to an additional *file* is detected. Fixes: #17278, #17205
* | | | | CMake Nightly Date StampKitware Robot2017-09-141-1/+1
| | | | |
* | | | | Merge topic 'improve-graphviz-doc'Craig Scott2017-09-142-9/+9
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | 7ed35aa3 Docs: Improve markup for graphviz related documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1236
| * | | | Docs: Improve markup for graphviz related documentationJano Svitok2017-09-112-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | - add hyperlink to CMakeGraphVizOptions.cmake in cmake(1) - improve markup in CMakeGraphVizOptions.cmake
* | | | | Merge topic 'msvc-base-features'Brad King2017-09-131-0/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 39be8a9d MSVC: Avoid unnecessary C++ feature detection steps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1253
| * | | | | MSVC: Avoid unnecessary C++ feature detection stepsBrad King2017-09-121-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10) we run full per-language-standard feature detection for MSVC. This is not necessary because the base mode for MSVC has all features we define except for the meta-features for C++14 and above. Override the default C++ feature detection macro for MSVC to run detection only once as before. Fixes: #17274
* | | | | | Merge topic 'MsvcArm64'Brad King2017-09-1310-5/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc7c94fe MSVC: Add support for ARM64 architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1215
| * | | | | | MSVC: Add support for ARM64 architectureMinmin Gong2017-09-1210-5/+35
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 15.4 adds support for this architecture. Fixes: #17213
* | | | | | Merge topic 'ranged-for'Brad King2017-09-13133-3592/+2456
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7d509579 Meta: modernize old-fashioned loops to range-based `for`. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1249
| * | | | | Meta: modernize old-fashioned loops to range-based `for`.Pavel Solodovnikov2017-09-12133-3592/+2456
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes done via `clang-tidy` with some manual fine-tuning for the variable naming and `auto` type deduction where appropriate.
* | | | | | CMake Nightly Date StampKitware Robot2017-09-131-1/+1
| | | | | |
* | | | | | Merge topic 'vs-clang-llvm-support'Brad King2017-09-122-4/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a4755ca VS: Update support for LLVM-vs* toolsets from LLVM 5.0 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1231
| * | | | | | VS: Update support for LLVM-vs* toolsets from LLVM 5.0Konstantin Ivlev2017-09-112-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.7.0-rc1~25^2 (VS: Recognize VS/LLVM toolset names as Clang, 2016-09-28). Since at least LLVM 5.0 the VS integration of the LLVM toolchain now mimics cl and accepts MSVC-style command-line arguments (unlike Microsoft Clang/C2). Fixes: #17193, #17235
* | | | | | | Merge topic 'get-or-create-source-group'Brad King2017-09-124-103/+85
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 95b17c89 Use cmMakefile::GetOrCreateSourceGroup in cmQtAutogeneratorsInitializer a451995f Use cmMakefile::GetOrCreateSourceGroup in cmSourceGroupCommand 1e6569c9 cmMakefile: Add GetOrCreateSourceGroup methods 3e8b3e94 cmMakefile: Collect source group methods in one place Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1243
| * | | | | | Use cmMakefile::GetOrCreateSourceGroup in cmQtAutogeneratorsInitializerSebastian Holtermann2017-09-091-14/+1
| | | | | | |
| * | | | | | Use cmMakefile::GetOrCreateSourceGroup in cmSourceGroupCommandSebastian Holtermann2017-09-091-32/+2
| | | | | | |
| * | | | | | cmMakefile: Add GetOrCreateSourceGroup methodsSebastian Holtermann2017-09-092-0/+33
| | | | | | |
| * | | | | | cmMakefile: Collect source group methods in one placeSebastian Holtermann2017-09-092-57/+49
| | | | | | |
* | | | | | | Merge topic 'iwyu-update'Brad King2017-09-121-0/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ea7177b9 cmCustomCommandGenerator: Fix include-what-you-use diagnostic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1252
| * | | | | | | cmCustomCommandGenerator: Fix include-what-you-use diagnosticBrad King2017-09-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For `size_t` we should include `stddef.h`.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-09-121-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'find-openssl'Brad King2017-09-111-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d371b52f FindOpenSSL: Search 'ssld' and 'crypod' for debug variants Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1246
| * | | | | | | | FindOpenSSL: Search 'ssld' and 'crypod' for debug variantsRobert Dailey2017-09-081-0/+2
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Release variant search already considered `ssl` and `crypto`, but similarly named libs with `d` postfix were not searched for debug variant.
* | | | | | | | Merge topic 'doc-find_dependency-return'Brad King2017-09-111-17/+28
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e48acfc5 CMakeFindDependencyMacro: Document return() behavior and caveats 07a05079 CMakeFindDependencyMacro: Convert documentation to bracket comment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1245
| * | | | | | | CMakeFindDependencyMacro: Document return() behavior and caveatsBrad King2017-09-081-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `find_dependency` macro is designed to be called from Package Configuration Files, not from Find Modules. The return() behavior is particularly problematic for find modules. Document this more clearly. Issue: #17257
| * | | | | | | CMakeFindDependencyMacro: Convert documentation to bracket commentBrad King2017-09-081-17/+17
| |/ / / / / /
* | | | | | | Merge topic 'vs_improve_custom_command'Brad King2017-09-118-8/+126
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ed24280 VS: only add custom command line if it is not empty 34c4108b add HasOnlyEmptyCommandLines() method to cmCustomCommandGenerator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1050
| * | | | | | VS: only add custom command line if it is not emptyMichael Stürmer2017-09-046-8/+113
| | | | | | |
| * | | | | | add HasOnlyEmptyCommandLines() method to cmCustomCommandGeneratorMichael Stürmer2017-09-042-0/+13
| | | | | | |
* | | | | | | Merge topic 'timestamp'Brad King2017-09-115-2/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 014ad298 Timestamp: support %A and %B Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1228
| * | | | | | | Timestamp: support %A and %BBernhard M. Wiedemann2017-09-075-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are defined both by [1] and [2] to give full names of a weekday and month. [1] http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html [2] https://msdn.microsoft.com/de-de/library/fe06s4ak.aspx