mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-13 18:00:09 -06:00
Code Issues Packages Projects Releases Wiki Activity
37,845 Commits 2 Branches 385 Tags
bbc9c96691c06cdcff0227ad8292e2a2ea60ec00
Commit Graph

23686 Commits

Author SHA1 Message Date
Kitware Robot
d802f357d7 CMake Nightly Date Stamp 2017-11-03 00:01:12 -04:00
Brad King
817331aae8 Merge topic 'deprecate-policy-old' 
a0ec14d3 Add deprecation warnings for policies CMP0054 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1438
 2017-11-02 09:44:41 -04:00
Brad King
193e40daa5 Merge topic 'update-kwsys' 
7576e9f8 Merge branch 'upstream-KWSys' into update-kwsys
7d3f33e6 KWSys 2017-11-01 (6ffca34c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1436
 2017-11-02 09:43:48 -04:00
Kitware Robot
d455a04c53 CMake Nightly Date Stamp 2017-11-02 00:01:06 -04:00
Brad King
a0ec14d363 Add deprecation warnings for policies CMP0054 and below 
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for some policies
to encourage projects to port away from setting policies to OLD.
 2017-11-01 11:46:53 -04:00
Brad King
7576e9f8a3 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-11-01 (6ffca34c)
 2017-11-01 08:38:26 -04:00
Brad King
77e758a3ed Merge topic 'autogen-moc-predefs-no-moc-options' 
4e46f97c Merge branch 'backport-3.9' into autogen-moc-predefs-no-moc-options
978c98b7 Autogen: Don't add AUTOMOC_MOC_OPTIONS to moc-predefs command
d3caf941 Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple test
96d20a4d Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: EoD <eod@xmw.de>
Merge-request: !1432
 2017-11-01 08:05:47 -04:00
Brad King
cdc9c110a5 Merge topic '16780-write-single-xcodeproj' 
e4e9ce7c Xcode: Add option to generate only topmost project file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1395
 2017-11-01 08:02:15 -04:00
Brad King
4857aec5d5 Merge topic 'notes_timestamp' 
0987a399 CTest: fix Time formatting in Notes.xml

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1428
 2017-11-01 08:01:44 -04:00
Brad King
ac1d190291 Merge topic 'windows-embed-cmake-version' 
5b9da05b Windows: Embed version information into CMake binaries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1412
 2017-11-01 08:00:45 -04:00
Kitware Robot
a0d00a1710 CMake Nightly Date Stamp 2017-11-01 00:01:05 -04:00
Gregor Jasny
e4e9ce7cbe Xcode: Add option to generate only topmost project file 
Closes #16780
 2017-10-31 17:09:26 +01:00
Justin Goshi
5b9da05b7a Windows: Embed version information into CMake binaries 2017-10-31 10:02:25 -04:00
Zack Galbreath
0987a399ec CTest: fix Time formatting in Notes.xml 
Notes.xml was reporting its timestamp in E-notation.  Here's an example of
what this looked like:
  <Time>1.50938e+09</Time>

This format is unsuitable for precisely determining when the Notes file
was generated.  As a result of this commit, the same field now appears as:
  <Time>1509383044</Time>
 2017-10-31 10:00:38 -04:00
Sebastian Holtermann
96d20a4de3 Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs command 
Closes #17418
 2017-10-31 14:20:24 +01:00
Brad King
9ba15bfceb Merge topic 'autogen-change-rcc-config-suffix' 
bda0875a Autogen: Make rcc output file suffix static (instead of pseudo-random)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Taylor Braun-Jones <taylor@braun-jones.org>
Merge-request: !1425
 2017-10-31 08:54:26 -04:00
Brad King
6341596e29 Merge topic 'cmp0037-conditional-targets' 
ae5f4069 CMP0037: Allow test and package targets when features are not enabled
409527a0 CMP0037: De-duplicate check and message generation
a2611d81 Tests: Add RunCMake.CMP0037 case for WARN on reserved targets
103501c4 Tests: Do not enable languages in all cases of RunCMake.CMP0037
2d0b3e6e cmGlobalGenerator: Refactor test and package target conditions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1417
 2017-10-31 08:19:27 -04:00
Brad King
8c6fa52515 Merge topic '15468-xcode-hide-zero-check-source-group' 
89add9b3 Xcode: Do not create ZERO_CHECK source group

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1429
 2017-10-31 08:13:52 -04:00
Brad King
9c2e8cf8a2 Merge topic 'vs-hlsl-opt-dbg' 
025221df VS: Add source file property to set hlsl debug and optimization flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1420
 2017-10-31 08:11:49 -04:00
Brad King
31336538b8 Merge topic 'minifixes' 
6a4a61d9 cmForEachCommand: prevent leakage
52680d80 cm_codecvt: cleanup superfluous semicolons

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1402
 2017-10-31 08:11:13 -04:00
Kitware Robot
fd2e6212a6 CMake Nightly Date Stamp 2017-10-31 00:01:05 -04:00
Gregor Jasny
89add9b3e6 Xcode: Do not create ZERO_CHECK source group 
Closes #15468
 2017-10-30 18:39:40 +01:00
Sebastian Holtermann
bda0875ac3 Autogen: Make rcc output file suffix static (instead of pseudo-random) 2017-10-30 16:30:46 +01:00
Brad King
ae5f40696e CMP0037: Allow test and package targets when features are not enabled 
When CMake will not generate a test, package, or package_source target,
allow projects to create their own targets with these names.

Fixes: #16062
 2017-10-30 10:21:31 -04:00
Brad King
409527a03c CMP0037: De-duplicate check and message generation 2017-10-30 10:21:21 -04:00
Matthias Maennich
6a4a61d9e1 cmForEachCommand: prevent leakage 2017-10-30 09:55:02 -04:00
Matthias Maennich
52680d8092 cm_codecvt: cleanup superfluous semicolons 2017-10-30 09:54:44 -04:00
Jeremiah van Oosten
025221df2a VS: Add source file property to set hlsl debug and optimization flags 
Add `VS_SHADER_DISABLE_OPTIMIZATIONS` and `VS_SHADER_ENABLE_DEBUG`
source file properties to control these settings on `.hlsl` files in the
VS generator.

Fixes: #17406
 2017-10-30 09:52:10 -04:00
Brad King
41d796be15 Merge topic 'vs-diagnostics-flag' 
82f95c95 VS generator: support /diagnostics compiler flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1411
 2017-10-30 09:04:37 -04:00
Brad King
9bfc43a5e5 Merge topic 'autogen-qrc-file-name' 
a8bf0b2b Autogen: RCC: Append checksum suffix to wrapped file name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1422
 2017-10-30 08:58:26 -04:00
Brad King
469ac58925 Merge branch 'autogen-qrc-file-name' into release-3.10 
Merge-request: !1422
 2017-10-30 08:57:38 -04:00
Brad King
a7b770686a Merge topic 'fix-co-compile' 
197b4e18 Merge branch 'backport-fix-co-compile' into fix-co-compile
992962c7 cmcmd: Restore support for running multiple lint tools
a5197eea cmcmd: Convert lint handlers to file-static functions
1c075ffd cmcmd: Rename loop iteration variable for clarity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1418
 2017-10-30 08:46:59 -04:00
Brad King
9bec6afa7a Merge topic 'autogen-static-library-cycles' 
3a4db861 Autogen: Tests: Add test for STATIC_LIBRARY cycles
798e4f2f Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1408
 2017-10-30 08:45:49 -04:00
Kitware Robot
20f462dffc CMake Nightly Date Stamp 2017-10-30 00:01:03 -04:00
Kitware Robot
4d7fedf8a2 CMake Nightly Date Stamp 2017-10-29 00:01:04 -04:00
Sebastian Holtermann
a8bf0b2b37 Autogen: RCC: Append checksum suffix to wrapped file name 
Closes #17404
 2017-10-29 03:28:20 +01:00
Kitware Robot
ced94bcbd9 CMake Nightly Date Stamp 2017-10-28 00:01:04 -04:00
Brad King
8ffc1c3d89 Merge topic 'generalize-importedtargets-behavior' 
fb88d2b5 Help: Add notes for topic 'generalize-importedtargets-behavior'
494906a8 Add support for IMPORTED GLOBAL targets to be aliased
fe4b25ec Teach target_* commands to set INTERFACE properties of IMPORTED targets
e40fd9fd cmTargetPropCommandBase: Fix typo in error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !1264
 2017-10-27 09:47:31 -04:00
Brad King
dcca130bb0 Merge topic 'cmdparser-strcpy' 
576c079f cmCommandArgumentParser: remove the variable tokens from the class
98cb9f3e cmCommandArgumentParserHelper: constify some char* values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1410
 2017-10-27 09:43:09 -04:00
Brad King
b779b8e85f Merge topic 'cmp0040-wording' 
a1b1f1a2 CMP0040: Clarify policy warning to match documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1415
 2017-10-27 09:42:37 -04:00
Brad King
0504fc8d84 Merge branch 'backport-fix-co-compile' into release-3.10 
Merge-request: !1418
 2017-10-27 09:41:25 -04:00
Brad King
dc4d2021e1 Merge branch 'autogen-static-library-cycles' into release-3.10 
Merge-request: !1408
 2017-10-27 09:41:11 -04:00
Sebastian Holtermann
798e4f2fad Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependencies 
When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target
from the cycle to the `_autogen` target dependencies.

Closes #17389
 2017-10-27 09:37:15 -04:00
Brad King
197b4e18d4 Merge branch 'backport-fix-co-compile' into fix-co-compile 
Resolve a logical conflict by replacing `cmArray{Begin,End}` from
the their side with `cm::{cbegin,cend}` from our side.
 2017-10-27 09:31:04 -04:00
Brad King
992962c76d cmcmd: Restore support for running multiple lint tools 
Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be
one big if statement, 2017-08-28) incorrectly changed the logic to run
only one lint tool at a time.  Restore support for running all tools
specified on the command-line.
 2017-10-27 09:26:50 -04:00
Brad King
a5197eeac7 cmcmd: Convert lint handlers to file-static functions 
These do not need to be declared in the header.
 2017-10-27 08:36:28 -04:00
Brad King
1c075ffd60 cmcmd: Rename loop iteration variable for clarity 2017-10-27 08:36:28 -04:00
Kitware Robot
971b8c3c80 CMake Nightly Date Stamp 2017-10-27 00:01:10 -04:00
Brad King
2d0b3e6ed2 cmGlobalGenerator: Refactor test and package target conditions 
In `AddGlobalTarget_{Test,Package,PackageSource}`, check conditions up
front and return early if the targets are not needed.  This reduces the
indentation of the main logic.
 2017-10-26 14:09:38 -04:00
Brad King
f01576012f Merge branch 'cmp0040-wording' into release-3.10 
Merge-request: !1415
 2017-10-26 09:48:28 -04:00