mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-20 14:58:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,680 Commits 2 Branches 401 Tags
1876f2d03fe3ccc4ea02c27fe345657b3366b48e
Commit Graph

30546 Commits

Author SHA1 Message Date
Duncan Barber 1876f2d03f Autogen: Move duplicated filename generation code into a function 2021-04-10 18:33:24 +01:00
Duncan Barber 087b717aef Autogen: Move duplicated executable dependency code into a function 2021-04-10 18:33:23 +01:00
Duncan Barber 0656bebeae Autogen: Rename the variable for UI files with UIC options 
Monitoring for UI file changes in the target sources will require keeping track of the files without options as well so this will improve clarity.
 2021-04-10 18:33:22 +01:00
Kitware Robot aa283fdba1 CMake Nightly Date Stamp 2021-04-10 00:01:04 -04:00
Kitware Robot eb62097dec CMake Nightly Date Stamp 2021-04-09 00:01:21 -04:00
Brad King 21f0478ade Merge topic 'presets-optional-generator-and-builddir' 
06e6981336 cmake-presets: Make generator and binaryDir fields optional

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5946
 2021-04-08 07:49:56 -04:00
Brad King a0e5998bd6 Merge topic 'ctest-wait-verbosity' 
82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode
80da23f2a2 Tests: Add RunCTest helper option to control CTest verbose flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5990
 2021-04-08 07:49:05 -04:00
Kitware Robot 8ffd3b4946 CMake Nightly Date Stamp 2021-04-08 00:01:25 -04:00
Brad King b962b9cf1d Merge topic 'autouic-source-group-fixes' 
e8ddc1e268 Autogen: Fix a bug in setting the UIC source group
7f0151dc91 Help: Document the AUTOUIC_SOURCE_GROUP property
f6c47dd0b4 Help: Fix a typo in the AUTOGEN_SOURCE_GROUP help

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexey Edelev <alexey.edelev@qt.io>
Merge-request: !5978
 2021-04-07 08:45:06 -04:00
Kitware Robot a8b6b54239 CMake Nightly Date Stamp 2021-04-07 00:06:15 -04:00
friendlyanon 06e6981336 cmake-presets: Make generator and binaryDir fields optional 
In v3 of the presets, generator and buildDir can be omitted to fall
back to regular cmake behavior when these values are not explicitly
provided by the user.

Fixes: #21987
 2021-04-07 01:24:44 +02:00
Brad King 82e40607a4 ctest: Display test "WAITING" messages only in extra-verbose mode 
These messages are incidental scheduling output.  Avoid cluttering
the normal verbose output showing tests starting and finishing.
 2021-04-06 14:48:14 -04:00
Kitware Robot 5160204fc2 CMake Nightly Date Stamp 2021-04-06 00:01:30 -04:00
Kitware Robot 3d700254f4 CMake Nightly Date Stamp 2021-04-05 00:01:24 -04:00
Duncan Barber e8ddc1e268 Autogen: Fix a bug in setting the UIC source group 
If the relative path to a UI file was empty then the source group for the corresponding autogen header file would not apply because of a double slash in the path.
 2021-04-04 12:29:59 +01:00
Kitware Robot 20e90c08e3 CMake Nightly Date Stamp 2021-04-04 00:01:11 -04:00
Kitware Robot d904b74c9e CMake Nightly Date Stamp 2021-04-03 00:01:54 -04:00
Kitware Robot 55843b899e CMake Nightly Date Stamp 2021-04-02 00:01:22 -04:00
Brad King 1c399ca88c Merge topic 'cmake-presets-condition-regex' 
5ac8b923f5 CMakePresets.json: Add matches condition

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5963
 2021-04-01 10:26:12 -04:00
Brad King 6068e54dbd Merge topic 'genex-HOST_LINK-in-try_compile' 
6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5964
 2021-04-01 10:22:15 -04:00
Brad King b362c0bb26 Merge topic 'CUDA-device-link' 
bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5962
 2021-04-01 10:21:11 -04:00
Brad King dfa3a25060 Merge topic 'make-fix-deps-paths' 
1b346350af Makefiles dependencies: normalize windows paths

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5955
 2021-04-01 10:19:59 -04:00
Kitware Robot a8d2f7f459 CMake Nightly Date Stamp 2021-04-01 00:01:23 -04:00
Marc Chevrier 6cf81efe7d Genex: $<HOST_LINK:> and $<DEVICE_LINK:> must be usable in try_compile 
Fixes: #22007
 2021-03-31 19:03:35 +02:00
Kyle Edwards 5ac8b923f5 CMakePresets.json: Add matches condition 2021-03-31 10:24:24 -04:00
Brad King cda40a42f1 Merge topic 'update-kwsys' 
25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys
d0b9ffb630 KWSys 2021-03-30 (db93a594)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5960
 2021-03-31 09:27:58 -04:00
Marc Chevrier bb96984ec9 CUDA Device link: Ensure all link options are correctly formatted 
Fixes: #21994
 2021-03-31 12:05:23 +02:00
Kitware Robot d796948f44 CMake Nightly Date Stamp 2021-03-31 00:01:19 -04:00
Brad King 25ccb2c7c3 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-03-30 (db93a594)
 2021-03-30 10:45:01 -04:00
Brad King d9b8acd238 Merge topic 'ifw-depends-name-version-parsing' 
a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS
f536e6f3fb CPackIFW: Remove redundant variable assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5929
 2021-03-30 09:56:31 -04:00
Brad King e6a5799fa0 Merge topic 'multiple-L-labels' 
44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Lars Bilke <larsbilke83@googlemail.com>
Merge-request: !5329
 2021-03-30 09:55:42 -04:00
Brad King c0092247fe Merge topic 'ninja-automoc-cycle' into release-3.20 
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
 2021-03-30 09:54:09 -04:00
Brad King f14e19c053 Merge topic 'ninja-automoc-cycle' 
ca7c76269b Tests: Add test for Ninja automoc dependency cyle
54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jörg Bornemann <joerg.bornemann@qt.io>
Acked-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5956
 2021-03-30 09:54:09 -04:00
Brad King 1df75b171d Merge topic 'nmc-cc-no-output' into release-3.20 
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
 2021-03-30 09:50:48 -04:00
Brad King efcdec9a19 Merge topic 'nmc-cc-no-output' 
6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output
e21a80e97d Tests: Teach RunCMake to ignore incidental 'Recompacting log' ninja output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5950
 2021-03-30 09:50:48 -04:00
Marc Chevrier 1b346350af Makefiles dependencies: normalize windows paths 
Fixes: #21997
 2021-03-30 15:04:03 +02:00
Kitware Robot 2e77199030 CMake Nightly Date Stamp 2021-03-30 00:01:18 -04:00
Kyle Edwards 54ad3e4958 autogen: Don't include SKIP_AUTOMOC files in depfile 
SKIP_AUTOMOC files should not be included in moc processing, which
means they shouldn't be included in the depfile either. Remove them.

Fixes: #21977
 2021-03-29 15:17:11 -04:00
Brad King 6dd89529e8 Ninja Multi-Config: Fix crash on custom command config with no output 
With generator expressions in a custom command's `OUTPUT` and
`BYPRODUCTS`, it is possible to have no outputs at all for a particular
configuration.  Generate no rule in this case.

Fixes: #21989
 2021-03-29 09:56:43 -04:00
Brad King 94f6ac5b50 Merge topic 'SWIG' 
1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5949
 2021-03-29 09:36:36 -04:00
Brad King d212d91f14 Merge topic 'commands-file-permissions' into release-3.20 
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
 2021-03-29 09:32:09 -04:00
Brad King 75dd9b6c97 Merge topic 'commands-file-permissions' 
769ff05483 Help: Clarify permission-related command options
900184616a Cleanup: Fix misspelt name of local C++ variable
635431a0c9 Tests: Check host platform instead of target for running stat
4ceb0ca59e Tests: Remove redundant files for configure_file() tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5945
 2021-03-29 09:32:09 -04:00
Brad King c4f8005454 Merge topic 'correct_arg_parsing' 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:40 -04:00
Brad King 0e37e0d215 Merge topic 'correct_arg_parsing' into release-3.20 
79d7bcaf40 cmCommandLineArgument: correctly compute next parse index

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5936
 2021-03-29 09:29:39 -04:00
Kitware Robot d5ab6a53ed CMake Nightly Date Stamp 2021-03-29 00:01:18 -04:00
Kitware Robot 699577e7b2 CMake Nightly Date Stamp 2021-03-28 00:01:11 -04:00
Adriaan de Groot 44ad3f0b7f ctest: Support multiple -L and -LE options to mean "AND" 
Fixes: #21087
 2021-03-28 12:04:05 +11:00
Kitware Robot b22c800604 CMake Nightly Date Stamp 2021-03-27 00:01:17 -04:00
Craig Scott a43783a08d CPackIFW: Fix parsing of name and version in component DEPENDS 
The DEPENDS or DEPENDENCIES arguments in a call to
cpack_ifw_configure_component() or cpack_ifw_configure_component_group()
specify a name and optionally a version constraint as a single string.
QtIFW also allows a colon (requires QtIFW 3.1 or later) or a hyphen to
separate the name and version. The version may optionally contain a
leading operator, with = being assumed when no operator is present.

The previous code was not handling : as a separator at all and was
erroneously dropping the version part when no operator was given.
Fix both of those non-conforming behaviors and also warn if trying
to use a hyphen in a name with a QtIFW version that isn't recent enough
to support it.

Fixes: #21697
 2021-03-27 07:44:00 +11:00
Marc Chevrier 1d8e3a1e77 UseSWIG: Use standard library name conventions for csharp language 
Fixes: #21542
 2021-03-26 16:27:18 +01:00