Brad King
377254b195
Merge topic 'help_fixup'
...
1667e244 Help: Fix command references in CMAKE_NETRC* variable documentation
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1770
2018-02-20 11:40:18 -05:00
Kitware Robot
31419815aa
CMake Nightly Date Stamp
2018-02-20 00:01:08 -05:00
Kitware Robot
a99ff558af
CMake Nightly Date Stamp
2018-02-19 00:01:12 -05:00
Kitware Robot
33ace6eb91
CMake Nightly Date Stamp
2018-02-18 00:01:06 -05:00
Kitware Robot
3b6fe84cb7
CMake Nightly Date Stamp
2018-02-17 00:01:14 -05:00
Shane Parris
1667e24453
Help: Fix command references in CMAKE_NETRC* variable documentation
2018-02-16 09:41:03 -05:00
Brad King
524696ec10
Merge topic 'file_cmd_touch'
...
e78e24f6 Replaces execute_process calls to touch files with file(TOUCH) calls
602988e1 Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commands
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1705
2018-02-16 09:39:47 -05:00
Brad King
d97c9ffb6c
Merge topic 'genex-IN_LIST-operator'
...
5089f560 Genex: Add IN_LIST logical operator
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1724
2018-02-16 09:22:56 -05:00
Kitware Robot
269722ae5b
CMake Nightly Date Stamp
2018-02-16 00:01:12 -05:00
Shane Parris
e78e24f68c
Replaces execute_process calls to touch files with file(TOUCH) calls
2018-02-15 10:54:38 -05:00
Shane Parris
602988e1e5
Adds file(TOUCH) and file(TOUCH_NOCREATE) sub-commands
2018-02-15 10:54:18 -05:00
Brad King
a2ec98b7d9
Merge topic 'enhanced-UseSWIG-Module'
...
0bef9eb4 UseSWIG: modernize module
d6048bd1 UseSWIG: Re-work test framework
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1707
2018-02-15 08:50:29 -05:00
Brad King
b5d18cbd77
Merge topic 'directory-property-TESTS'
...
b513a879 Tests management: add TESTS directory property
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1748
2018-02-15 08:49:44 -05:00
Brad King
cab9838b4c
Merge branch 'release-3.11'
2018-02-15 08:43:32 -05:00
Brad King
8bd3e13ec3
Merge topic 'export-android-mk'
...
b6d68766 Android.mk: Fix export of static libraries with PRIVATE dependencies
56e16885 Android.mk: Evaluate generator expressions up front
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1766
2018-02-15 08:42:47 -05:00
Brad King
02edf08be2
Merge branch 'export-android-mk' into release-3.11
...
Merge-request: !1766
v3.11.0-rc1
2018-02-15 08:42:07 -05:00
Kitware Robot
cbdec57937
CMake Nightly Date Stamp
2018-02-15 00:01:08 -05:00
Brad King
b6d68766b1
Android.mk: Fix export of static libraries with PRIVATE dependencies
...
The `LINK_ONLY` generator expression is used to represent private
dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES`
property value. Fix evaluation of generator expressions during export
to support the `LINK_ONLY` genex. Extend the RunCMake.AndroidMK test
with a case for this.
2018-02-14 11:24:05 -05:00
Brad King
56e1688517
Android.mk: Evaluate generator expressions up front
...
When exporting `INTERFACE_LINK_LIBRARIES`, we must evaluate generator
expressions first, before expanding the `;` list, in case they contain
or generate semicolons.
2018-02-14 11:19:47 -05:00
Brad King
ead859f50c
Merge topic 'ninja-cmd'
...
22e8b3af Ninja: Generate scripts for long custom command sequences
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1604
2018-02-14 09:43:38 -05:00
Brad King
34d35cd592
Merge topic 'help_string_MAKE_C_IDENTIFIER'
...
a71ab3be Help: Expand string(MAKE_C_IDENTIFIER) docs
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1760
2018-02-14 09:36:59 -05:00
Brad King
7593c9ce8c
Merge topic 'const-members'
...
b721b9a3 cmVisualStudio10TargetGenerator: Make some data members const; simplify
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1750
2018-02-14 09:36:17 -05:00
Marc Chevrier
0bef9eb410
UseSWIG: modernize module
2018-02-14 08:35:04 +01:00
Marc Chevrier
d6048bd153
UseSWIG: Re-work test framework
2018-02-14 08:35:04 +01:00
Kitware Robot
d870148537
CMake Nightly Date Stamp
2018-02-14 00:01:12 -05:00
Brad King
58c637643d
Merge topic 'more-misc-typos'
...
193082a3 MAINT: Misc. typos
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1758
2018-02-13 11:28:31 -05:00
luz.paz
193082a3c8
MAINT: Misc. typos
...
Found via `codespell -q 3 -I ../cmake-whitelist.txt`.
2018-02-13 11:24:30 -05:00
Brad King
3b8b379852
Merge branch 'release-3.11'
2018-02-13 11:18:35 -05:00
Brad King
16c6764f9b
Merge topic '17711-reset-xcode-target-var'
...
4349393d cmGlobalXCodeGenerator: Properly initialize TARGETS variable
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1757
2018-02-13 11:17:25 -05:00
Brad King
31550ebf31
Merge topic 'autogen-write-on-change-only'
...
c85ef9c3 Autogen: Overwrite info files when changed only
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1753
2018-02-13 11:12:14 -05:00
Brad King
210a80f48d
Merge topic 'FindImageMagick-FixFor7.0.x'
...
91785239 FindImageMagick: Add 7.0 library names
Acked-by: Kitware Robot <kwrobot@kitware.com >
Merge-request: !1754
2018-02-13 11:08:38 -05:00
Brad King
43cd9467cd
Merge branch 'autogen-write-on-change-only' into release-3.11
...
Merge-request: !1753
2018-02-13 11:05:11 -05:00
Brad King
101ef67b99
Merge branch 'FindImageMagick-FixFor7.0.x' into release-3.11
...
Merge-request: !1754
2018-02-13 11:03:55 -05:00
Brad King
2a730e24c6
Merge branch '17711-reset-xcode-target-var' into release-3.11
...
Merge-request: !1757
2018-02-13 11:03:15 -05:00
Gregor Jasny
4349393d1d
cmGlobalXCodeGenerator: Properly initialize TARGETS variable
...
Fixes : #17711
2018-02-13 11:02:24 -05:00
Kitware Robot
ab8416776d
CMake Nightly Date Stamp
2018-02-13 00:01:07 -05:00
Kitware Robot
0465d3c204
CMake Nightly Date Stamp
2018-02-12 00:01:11 -05:00
Craig Scott
a71ab3be0e
Help: Expand string(MAKE_C_IDENTIFIER) docs
...
The MAKE_C_IDENTIFIER subcommand was also buried in the docs for the
TIMESTAMP subcommand, so it has been pulled out to its own subheading.
2018-02-11 21:04:26 +11:00
Kitware Robot
e24cda008e
CMake Nightly Date Stamp
2018-02-11 00:01:05 -05:00
Kitware Robot
1f39bfad47
CMake Nightly Date Stamp
2018-02-10 00:01:12 -05:00
Kitware Robot
b0c3696205
CMake Nightly Date Stamp
2018-02-09 00:01:06 -05:00
Marc Chevrier
b513a879ec
Tests management: add TESTS directory property
...
Implements: #17680
2018-02-08 19:16:28 +01:00
Kitware Robot
1da3f3e916
CMake Nightly Date Stamp
2018-02-08 00:01:12 -05:00
Marc Chevrier
5089f560e7
Genex: Add IN_LIST logical operator
...
Implements #17679
2018-02-07 10:57:18 +01:00
Kitware Robot
5656ebc87c
CMake Nightly Date Stamp
2018-02-07 00:01:05 -05:00
Roman Wüger
9178523968
FindImageMagick: Add 7.0 library names
...
For ImageMagick 7.0.x we need to consider `CORE_RL_MagickWand_` and
`CORE_RL_MagickCore_`.
2018-02-06 14:54:33 -05:00
Roger Leigh
22e8b3af04
Ninja: Generate scripts for long custom command sequences
...
Ninja runs just one command line for every build statement, so the Ninja
generator needs to `&&`-chain multiple commands together into one long
string. For long custom command sequences this can exceed the maximum
command-line length for the operating system. In such cases, write the
commands out to a script instead, and then run the script from Ninja's
one command line.
Co-Author: Brad King <brad.king@kitware.com >
Fixes : #15612
2018-02-06 13:24:46 -05:00
Sebastian Holtermann
c85ef9c339
Autogen: Overwrite info files when changed only
...
Check if the content of the AUTOMOC/UIC/RCC info file
will change before overwriting it. This avoids unnecessary
AUTORCC rebuilds when AUTORCC unrelated CMake settings change.
2018-02-06 11:20:08 -05:00
Kitware Robot
f7c08c333b
CMake Nightly Date Stamp
2018-02-06 00:01:07 -05:00
Vitaly Stakhovsky
b721b9a381
cmVisualStudio10TargetGenerator: Make some data members const; simplify
2018-02-05 19:50:54 -05:00