mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 22:58:37 -05:00
Code Issues Packages Projects Releases Wiki Activity
41,688 Commits 2 Branches 401 Tags
2462af22bca872e57714d8f22f483b60b4a44d34
Commit Graph

41688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kyle Edwards 2462af22bc Merge topic 'cygwin-install-test-fix' 
3f915531ad Tests: Fix Cygwin failure on RunCMake.install

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2754
 2018-12-20 11:13:35 -05:00
Kyle Edwards 9c41382165 Merge topic 'doc-stage' 
b99448e016 Help/dev: Document where topic stage branch is held

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2753
 2018-12-20 09:32:05 -05:00
Marc Chevrier 0495ce4f98 Merge branch 'topic-findliblzma' into 'master' 
FindLibLZMA: add imported target

Closes #18679 and #18680

See merge request cmake/cmake!2730
 2018-12-20 06:17:35 -05:00
Kitware Robot bc789afac9 CMake Nightly Date Stamp 2018-12-20 00:01:05 -05:00
Kyle Edwards 3f915531ad Tests: Fix Cygwin failure on RunCMake.install 2018-12-19 12:04:59 -05:00
Kyle Edwards fa9853d833 Merge topic 'member-init' 
b2aa3aedea clang-tidy: Use default member initialization
32cb564bea clang-tidy: Remove redundant member initializations
7ffa6bf999 cmUVHandlePtr: Use inherited constructors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2726
 2018-12-19 12:02:27 -05:00
Brad King b99448e016 Help/dev: Document where topic stage branch is held 2018-12-19 11:53:14 -05:00
Kitware Robot e4c5e81f31 CMake Nightly Date Stamp 2018-12-19 00:01:04 -05:00
Craig Scott f7947d90db Merge topic 'contributing-build-instructions-link' 
0861580a14 Help: Insert link from CONTRIBUTING to build instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2751
 2018-12-18 16:06:13 -05:00
Joachim Wuttke (h) 0861580a14 Help: Insert link from CONTRIBUTING to build instructions 2018-12-18 17:11:13 +01:00
Brad King 89d0f720cb Merge topic 'copyright-year' 
64819cca91 Copyright.txt: Update year range to end in 2019

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2749
 2018-12-18 09:18:26 -05:00
Brad King 64819cca91 Copyright.txt: Update year range to end in 2019 2018-12-18 08:15:03 -05:00
Kitware Robot 3bd8144601 CMake Nightly Date Stamp 2018-12-18 00:01:04 -05:00
Kitware Robot 50454c96d6 CMake Nightly Date Stamp 2018-12-17 00:01:04 -05:00
Kitware Robot b689679594 CMake Nightly Date Stamp 2018-12-16 00:01:04 -05:00
Regina Pfeifer b2aa3aedea clang-tidy: Use default member initialization 2018-12-15 10:52:37 +01:00
Regina Pfeifer 32cb564bea clang-tidy: Remove redundant member initializations 2018-12-15 10:51:47 +01:00
Regina Pfeifer 7ffa6bf999 cmUVHandlePtr: Use inherited constructors 2018-12-15 10:23:23 +01:00
Kitware Robot b95b935ccf CMake Nightly Date Stamp 2018-12-15 00:01:04 -05:00
Kitware Robot d84b2cc334 CMake Nightly Date Stamp 2018-12-14 00:01:04 -05:00
Brad King 65b54a01ad Merge topic 'doc-get-target-property' 
34b7003d2a Documentation: Reference list of target properties in get_target_property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2736
 2018-12-13 10:29:12 -05:00
Brad King e2d0da3366 Merge topic 'vs_deploy_content_fix' 
b5b63da088 VS: Fix Deploy content in .csproj files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2713
 2018-12-13 10:03:52 -05:00
Brad King ed1c375c05 Merge topic 'vs-csharp-ref-dot' 
ea3d60cffa VisualStudio10TargetGenerator: support C# refs with '.' in file name.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2729
 2018-12-13 10:03:00 -05:00
Brad King 6589f67fb7 Merge topic 'UseJava-jar-depends' 
5aa88f0e02 UseJava: add_jar: rebuild jar on dependencies changes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2727
 2018-12-13 10:02:14 -05:00
Brad King eef87a37cd Merge topic 'server-mode-install-fix' 
c150bf087c Server mode: Fix regression of hasInstallRule

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2735
 2018-12-13 10:01:34 -05:00
Brad King 04a9145af5 Merge topic 'update-kwsys' 
b29d96701b Merge branch 'upstream-KWSys' into update-kwsys
8ca8daeb47 KWSys 2018-12-12 (abb8c680)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2733
 2018-12-13 10:00:27 -05:00
Brad King 0be5ed7128 Merge topic 'custom-string' 
2d68b2c593 String: Add str_if_stable() as a const alternative to str()
a0841b59bd String: Add support for a ""_s string literal syntax
9d5fe8e96a String: Add 'borrow' member to construct borrowing instances
80802a002c String: Add support for concatenation by operator+
ff69763ca0 String: Add a custom string type
410a3e4b22 Add support for using C++17 string_view or a fallback

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Acked-by: Pavel Solodovnikov <hellyeahdominate@gmail.com>
Merge-request: !2578
 2018-12-13 09:58:50 -05:00
Brad King dc90cd6877 Merge topic 'fileapi' 
b9c6f08276 Help: Add release note for fileapi feature
4b6b2a571c fileapi: extend codemodel v2 with directory details
eb8c7676a4 fileapi: extend codemodel v2 with a project model
42f0125ceb fileapi: Add test for cmakeFiles v1
6615408193 fileapi: add cmakeFiles v1
3f6ee75a66 fileapi: Add test for cache v2
7489e95b8e fileapi: add cache v2
ea0a060168 fileapi: Add test for codemodel v2
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2706
 2018-12-13 09:57:59 -05:00
Brad King a9d9e8cafc Merge branch 'release-3.13' 2018-12-13 08:19:35 -05:00
Brad King 9bbfbd54ba CMake 3.13.2 v3.13.2 2018-12-13 06:44:30 -05:00
Tobias Hunger 34b7003d2a Documentation: Reference list of target properties in get_target_property 2018-12-13 11:05:04 +01:00
Kitware Robot dea01ac30a CMake Nightly Date Stamp 2018-12-13 00:01:05 -05:00
Hiroshi Miura 9644c835b3 FindLibLZMA: add imported target 
- Add imported target LibLZMA::LibLZMA
- Show found message with library path
- Add test for FindLibLZMA

Fixes: #18680, #18679

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2018-12-13 09:40:11 +09:00
Brad King b9c6f08276 Help: Add release note for fileapi feature 
Fixes: #18398
 2018-12-12 15:12:26 -05:00
Brad King 4b6b2a571c fileapi: extend codemodel v2 with directory details 
Issue: #18398
Co-Author: Kyle Edwards <kyle.edwards@kitware.com>
 2018-12-12 15:12:26 -05:00
Brad King eb8c7676a4 fileapi: extend codemodel v2 with a project model 
Offer clients a `project()`-centric view of the build system.  This is
similar to the directory-centric view but consolidates subdirectories
that do not call `project()` with a new project name.

Issue: #18398
Co-Author: Kyle Edwards <kyle.edwards@kitware.com>
 2018-12-12 15:12:26 -05:00
Kyle Edwards 42f0125ceb fileapi: Add test for cmakeFiles v1 2018-12-12 13:02:31 -05:00
Kyle Edwards c150bf087c Server mode: Fix regression of hasInstallRule 
The introduction of policy CMP0082, to run subdirectory install
rules in the correct order, caused a regression in server mode
where any directory with a subdirectory is marked as having an
install rule even if no "real" install rules are present. This
change fixes this regression for server mode.
 2018-12-12 10:29:50 -05:00
Brad King 6615408193 fileapi: add cmakeFiles v1 
Issue: #18398
 2018-12-12 09:46:13 -05:00
Kyle Edwards 3f6ee75a66 fileapi: Add test for cache v2 2018-12-12 09:46:13 -05:00
Brad King 7489e95b8e fileapi: add cache v2 
Start with v2 to distinguish it from server-mode v1.

Issue: #18398
 2018-12-12 09:46:13 -05:00
Kyle Edwards ea0a060168 fileapi: Add test for codemodel v2 2018-12-12 09:45:49 -05:00
Brad King 6a6900f616 Merge topic 'object-library-link' 
bab24e782c target_link_libraries: Propagate dependencies of object libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2725
 2018-12-12 08:32:17 -05:00
Brad King 71e74b4ae4 Merge topic 'fix-configure-line-number' 
fe9a16c80f cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew
dda4755b46 cmMakefile: Fix ConfigureString not passing filename and line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2675
 2018-12-12 08:30:45 -05:00
Artur Ryt fe9a16c80f cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew 
Added check for variable name in @@ evaluation and test for
configuring @CMAKE_CURRENT_LIST_LINE@ with new CMP0053

Fixes: #18646
 2018-12-12 08:29:14 -05:00
Artur Ryt dda4755b46 cmMakefile: Fix ConfigureString not passing filename and line 
It enables to use CMAKE_CURRENT_LIST_LINE in string(CONFIGURE)
Added tests for it for ${} and @@ notattion for old CMP0053
and ${} for new
 2018-12-12 08:29:01 -05:00
Brad King a23ac516b3 Merge topic 'machoFormat' 
c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2722
 2018-12-12 08:25:04 -05:00
Brad King 4a5e003d4c Merge topic 'FindThreads-drop-irix' 
83dab0c123 FindThreads: Drop IRIX-specific options and results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2717
 2018-12-12 08:24:10 -05:00
Brad King 287bf93a11 Merge topic 'vs_conformance_mode_flags' 
e0d6d01e52 VS: Add flag table entry for "permissive" flag to disable conformance mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2723
 2018-12-12 08:23:26 -05:00
Brad King abccf484e3 Merge topic 'default-test-timeout' 
3e0eb3307f Help: clarify documentation of ctest --timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2721
 2018-12-12 08:20:43 -05:00