summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-custom-templates'Brad King2019-11-186-9/+18
|\ | | | | | | | | | | | | | | 7d6ab5dc5b CPack: Restore support for custom package configuration templates Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Kyle Edwards <kyle.edwards@kitware.com> Merge-request: !4054
| * CPack: Restore support for custom package configuration templatesBrad King2019-11-156-9/+18
| | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 98617f1be0 (Refactor: Move CPack internal files to `Internal/CPack/` directory, 2019-07-09, v3.16.0-rc1~449^2) accidentally changed the public-facing names of the templates. The name passed to `FindTemplate` is searched in `CMAKE_MODULE_PATH` and should not change. Remove the `Internal/CPack/` prefix on the names added by that commit. Teach `FindTemplate` to use our builtin default directly when the public-facing name is not found in `CMAKE_MODULE_PATH`. Fixes: #19979
* | Merge topic 'CPackNuget-dep-id'Brad King2019-11-181-5/+3
|\ \ | | | | | | | | | | | | | | | | | | 26367b4bb2 CPack/NuGet: Do not mangle non-C-identifier chars in dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4044
| * | CPack/NuGet: Do not mangle non-C-identifier chars in dependenciesyacoub2019-11-141-5/+3
| | | | | | | | | | | | Fixes: #19956
* | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \
| * \ \ Merge topic 'docs-pch-reorg' into release-3.16Brad King2019-11-182-49/+75
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers() dae9a808fe Help: Reorganise target_precompile_headers() docs for readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4045
* | \ \ \ Merge topic 'docs-pch-reorg'Brad King2019-11-182-49/+75
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | cc88ede7a3 Help: Provide guidance on INTERFACE for target_precompile_headers() dae9a808fe Help: Reorganise target_precompile_headers() docs for readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4045
| * | | | Help: Provide guidance on INTERFACE for target_precompile_headers()Craig Scott2019-11-132-0/+16
| | | | | | | | | | | | | | | | | | | | Fixes: #19953
| * | | | Help: Reorganise target_precompile_headers() docs for readabilityCraig Scott2019-11-131-49/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorporates clarification of behavior when trying to specify REUSE_FROM on a target that already has its own precompile headers set. Fixes: #19970
* | | | | Merge branch 'release-3.16'Brad King2019-11-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'pch-reuse-no-prop' into release-3.16Brad King2019-11-184-11/+22
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4046
* | \ \ \ \ Merge topic 'pch-reuse-no-prop'Brad King2019-11-184-11/+22
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bb4c2781ce PCH: Do not issue an error on duplicate target_precompile_headers call Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4046
| * | | | | PCH: Do not issue an error on duplicate target_precompile_headers callCristian Adam2019-11-154-11/+22
| | |/ / / | |/| | | | | | | | | | | | | Fixes: #19970
* | | | | Merge branch 'release-3.16'Craig Scott2019-11-180-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge topic 'tutorial-replace-unicode-dash' into release-3.16Craig Scott2019-11-181-2/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4058
* | \ \ \ \ Merge topic 'tutorial-replace-unicode-dash'Craig Scott2019-11-181-2/+2
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 02aa03eb0a Tutorial: replace Unicode EN DASH with ASCII dash Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4058
| * | | | | Tutorial: replace Unicode EN DASH with ASCII dashArkadiusz Drabczyk2019-11-171-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unicode EN DASH is problematic: - it cannot be easily found in web browsers, editors etc. - it doesn't work when copied and run in the terminal
* | | | | Merge topic 'ccmake_redirect_stdstreams'Craig Scott2019-11-185-37/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88cfef0821 ccmake: redirect stdout/stderr to the displayed logs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4005
| * | | | | ccmake: redirect stdout/stderr to the displayed logsSylvain Joubert2019-11-165-37/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use cmSystemTools to report some messages. These should now be caught and displayed properly, both in ccmake and cmake-gui Avoid log display flickering during processing - Don't clear the screen each time the long message form is rendered. It always renders the whole screen again so clearing it only causes flickering. - Add scroll down capabilities to the long message form so that it can draw itself directly in the correct state. This removes the need to programatically scroll down just after that also caused flickering. Fixes #19882 Fixes #13288
* | | | | | CMake Nightly Date StampKitware Robot2019-11-181-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-11-171-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-11-161-1/+1
| | | | | |
* | | | | | Merge topic 'cmake-e-rm'Kyle Edwards2019-11-1570-54/+287
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d0100fac7 replace remove and remove_directory with rm in tests 5239fc5c75 cmake -E: Add rm with improved semantics over remove and remove_directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3949
| * | | | | | replace remove and remove_directory with rm in testsJohnny Jazeix2019-11-1330-39/+39
| | | | | | |
| * | | | | | cmake -E: Add rm with improved semantics over remove and remove_directoryJohnny Jazeix2019-11-1340-15/+248
| | | | | | |
* | | | | | | Merge topic 'cmFileLockPool-remove-dynamic-memory-usage'Brad King2019-11-155-33/+62
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8dd284bf19 cmFileLockPool: enhance items management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4041
| * | | | | | | cmFileLockPool: enhance items managementMarc Chevrier2019-11-145-33/+62
| | | | | | | |
* | | | | | | | Merge topic 'ctest_test-repeat'Brad King2019-11-1523-34/+187
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28994115e8 ctest_test: Add option to REPEAT tests 42d5d8f425 cmCTestMultiProcessHandler: Hold repeat mode as a member ed65b3e984 CTest: Rename internal APIs for --repeat options Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4011
| * | | | | | | | ctest_test: Add option to REPEAT testsBrad King2019-11-0717-4/+147
| | | | | | | | |
| * | | | | | | | cmCTestMultiProcessHandler: Hold repeat mode as a memberBrad King2019-11-073-4/+14
| | | | | | | | |
| * | | | | | | | CTest: Rename internal APIs for --repeat optionsBrad King2019-11-075-31/+31
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Replace use of the term "rerun" with "repeat" to match the public names.
* | | | | | | | Merge topic 'Fortran-line-continued-use'Brad King2019-11-159-996/+1015
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 154b8d1a27 Fortran: ignore CPP line directives in line-continued USE stmts 34b7dbbfc3 LexerParser: Regenerate parsers with bison 3.4.2 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4048
| * | | | | | | | Fortran: ignore CPP line directives in line-continued USE stmtsTiziano Müller2019-11-132-123/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue: #18188
| * | | | | | | | LexerParser: Regenerate parsers with bison 3.4.2Kitware Robot2019-11-138-874/+892
| | | | | | | | |
* | | | | | | | | Merge topic 'update-kwsys'Brad King2019-11-155-18/+33
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc01c73f2d Merge branch 'upstream-KWSys' into update-kwsys 78ce959a40 KWSys 2019-11-13 (e67ed8ef) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4047
| * \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-11-135-18/+33
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2019-11-13 (e67ed8ef)
| | * | | | | | | | KWSys 2019-11-13 (e67ed8ef)KWSys Upstream2019-11-135-18/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit e67ed8efaf193036a92b648eec2ea71fabc0c05a (master). Upstream Shortlog ----------------- Brad King (2): b019deea RegularExpression: Suppress VS 2013 warning C4351 a5248df0 CTestCustom: Suppress PGI Community Edition compiler license warnings Paul Smith (1): dfd0521e Terminal: Support GNU make's TTY notification environment variable Todd Martin (2): 0492cad3 SystemTools: Remove redundant ToWindowsExtendedPath calls 680ab6d2 FStream: Expose is_open publicly
* | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'objc-standard-fix' into release-3.16Brad King2019-11-151-14/+29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4050
* | \ \ \ \ \ \ \ \ \ Merge topic 'objc-standard-fix'Brad King2019-11-151-14/+29
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a818b6931 ObjC: Proper initialization of ObjC/XX standard properties Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !4050
| * | | | | | | | | | ObjC: Proper initialization of ObjC/XX standard propertiesCristian Adam2019-11-141-14/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic added by commit 81566557d5 (ObjC: Initialize ObjC/XX standard properties from C/C++ counterparts, 2019-11-09) to account for cases when the CXX standard is not explicitly set. Also, do not copy the `*_STANDARD_REQUIRED` and `*_EXTENSIONS` properties unless we copied the `*_STANDARD` property.
* | | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'objc-tests' into release-3.16Brad King2019-11-1523-87/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2e5e6ff1a Tests: Organize Objective C/C++ test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4051
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'objc-tests'Brad King2019-11-1523-87/+10
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2e5e6ff1a Tests: Organize Objective C/C++ test directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4051
| * | | | | | | | | | | Tests: Organize Objective C/C++ test directoriesBrad King2019-11-1423-87/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move them all under `Tests/ObjC` and `Tests/ObjCXX`.
* | | | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'fix-optional-test' into release-3.16Brad King2019-11-151-36/+48
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4049
* | \ \ \ \ \ \ \ \ \ \ \ Merge topic 'fix-optional-test'Brad King2019-11-151-36/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8bd920df1 Tests: Fix reliance on undefined behavior of cm::optional Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !4049
| * | | | | | | | | | | | Tests: Fix reliance on undefined behavior of cm::optionalKyle Edwards2019-11-131-36/+48
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test for cm::optional assumed that *opt would return a reference to a non-constructed object if opt.has_value() is false. However, on certain systems that build CMake with flags to harden the build, this condition aborts rather than returning the invalid reference. Fix this by getting the reference only when the cm::optional is known to actually have a value. Fixes: #19964
* | | | | | | | | | | | Merge branch 'release-3.16'Brad King2019-11-150-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |