Commit Graph

26141 Commits

Author SHA1 Message Date
Kitware Robot e1af2489fd CMake Nightly Date Stamp 2019-03-14 00:01:08 -04:00
Brad King 80b761b924 Merge topic 'update-documentation'
da2e588935 cmake: Upgrade 'cmake -E' commands description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3089
2019-03-13 10:19:21 -04:00
Brad King 7b81b1c72c Merge topic 'cuda_compiler_generator_expressions'
b53766b205 CUDA: Support compiler id and version generator expressions
b544e34af6 All VersionNode use the same capitalization pattern

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3085
2019-03-13 10:16:25 -04:00
Brad King 1b8c5a0c35 Merge topic 'revert-vs-msbuild-arch'
f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3090
2019-03-13 10:08:57 -04:00
Kitware Robot f74bb6527e CMake Nightly Date Stamp 2019-03-13 00:01:07 -04:00
Brad King f3cedf381e VS: Revert "Use MSBuild matching toolset host architecture"
Revert commit da402a081b (VS: Use MSBuild matching toolset host
architecture, 2019-01-28, v3.14.0-rc1~50^2).  Multiple people have
reported that the 64-bit `amd64/msbuild` tool fails in cases that the
32-bit `msbuild` works.  Drop our change pending further investigation
and hopefully a fix to VS.

Fixes: #18904, #19037
Issue: #18219
2019-03-12 12:53:06 -04:00
Bartosz Kosiorek da2e588935 cmake: Upgrade 'cmake -E' commands description
Fixes: #13204
2019-03-12 16:01:33 +01:00
Brad King 5822a7bed2 Merge topic 'shell_path'
463c2fba4e Genex: Teach SHELL_PATH to support a list of paths
21da25d2a8 Tests: Generalize GeneratorExpression MSYS path conversion workaround

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3057
2019-03-12 09:53:27 -04:00
Kitware Robot 7358f317e3 CMake Nightly Date Stamp 2019-03-12 00:01:07 -04:00
Robert Maynard b53766b205 CUDA: Support compiler id and version generator expressions
Introduce the CUDA_COMPILER_ID and CUDA_COMPILER_VERSION generator
expressions.
2019-03-11 12:33:43 -04:00
Robert Maynard b544e34af6 All VersionNode use the same capitalization pattern 2019-03-11 11:48:37 -04:00
Henri Manson 463c2fba4e Genex: Teach SHELL_PATH to support a list of paths
Extend the genex added by commit ca6ba3fee5 (Genex: Add a SHELL_PATH
expression, 2015-09-24, v3.4.0-rc1~37^2) to accept a `;`-list of paths,
convert them all, and generate a list separated by the native shell
`PATH``` separator.
2019-03-11 11:39:25 -04:00
Kitware Robot 7a30d72728 CMake Nightly Date Stamp 2019-03-11 00:01:05 -04:00
Kitware Robot 5c106bfc42 CMake Nightly Date Stamp 2019-03-10 00:01:05 -05:00
Kitware Robot ba3e8f9166 CMake Nightly Date Stamp 2019-03-09 00:01:09 -05:00
Brad King ec459c10c4 Merge topic 'optimize-properties-processing'
6ae5fffd0f Optimize target properties processing at generation step

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3062
2019-03-08 09:39:43 -05:00
Brad King 42bbde4193 Merge topic 'cmalgorithm-modernize-cmremoveduplicates'
bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3029
2019-03-08 09:38:54 -05:00
Brad King f96f1aa571 CMake 3.14.0-rc4 2019-03-08 07:34:57 -05:00
Brad King c2a3a945a5 Merge topic 'install-no-imported-global'
47389c5641 install: Do not crash on imported global target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3071
2019-03-08 07:32:48 -05:00
Brad King b7a861647e Merge topic 'cxx-checks-warning-match'
4ca5a815f2 C++ feature checks: Match warnings more strictly

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3075
2019-03-08 07:31:36 -05:00
Kitware Robot b90cab5bff CMake Nightly Date Stamp 2019-03-08 00:01:08 -05:00
Brad King 0e2804b9ba Merge branch 'cxx-checks-warning-match' into release-3.14
Merge-request: !3075
2019-03-07 15:00:26 -05:00
Brad King 4ca5a815f2 C++ feature checks: Match warnings more strictly
Require the word "warning" to appear at the start of a line, after
whitespace, or after a `:`.  This is the same that CTest launchers use
to match warnings.  It avoids matching "warning" inside file paths.

Fixes: #19019
2019-03-07 14:55:54 -05:00
Kyle Edwards 2992ba2d02 Merge topic 'feature/cleanup-ctest'
1166aa5ce7 ctest: refactor some code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3064
2019-03-07 09:46:03 -05:00
Marc Chevrier 6ae5fffd0f Optimize target properties processing at generation step
Avoid creating unnecessary `cmCompileGeneratorExpression` instances.
Use runtime polymorphism to avoid the full genex infrastructure when a
property value does not contain a genex.

Issue: #18965
2019-03-07 09:25:43 -05:00
Brad King c042c998d0 Merge branch 'install-no-imported-global' into release-3.14
Merge-request: !3071
2019-03-07 09:17:21 -05:00
Brad King 591fab8a6a Merge topic 'vs-explicit-newline'
0bf4418017 VS: Encode newlines in XML attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3065
2019-03-07 09:15:57 -05:00
Brad King 47389c5641 install: Do not crash on imported global target
Since commit e89ad0f94e (install: Allow installing targets created in
another directory, 2018-06-18, v3.13.0-rc1~407^2) the `install(TARGETS)`
command may find a global-scoped target outside the calling directory.
Ignore an `IMPORTED GLOBAL` target if it is found in this way.  Imported
targets cannot be installed, and trying to do so violates internal
invariants.

Fixes: #19022
2019-03-07 09:00:56 -05:00
Kitware Robot 8f05be9921 CMake Nightly Date Stamp 2019-03-07 00:01:08 -05:00
Brad King 898d21ebe6 Merge branch 'vs-explicit-newline' into release-3.14
Merge-request: !3065
2019-03-06 09:43:27 -05:00
Luca Cappa 0bf4418017 VS: Encode newlines in XML attributes
Encode `\n` as `&#10;` to avoid generating a literal newline inside an
XML attribute.  This is more readable and also fixes custom commands in
`.csproj` files with VS 2019 RC.

Fixes: #19001
2019-03-06 09:37:21 -05:00
Artur Ryt bf1e73305a cmAlgorithms: Refactor cmRemoveDuplicates
Use an iterator-based implementation with range-based one simply
deferring to it.

Also optimize a little by storing iterators to unique values to prevent
creating value copies.
2019-03-06 08:57:47 -05:00
Brad King 83183cbaec Merge topic 'vs-no-stamp-messages'
67428e9025 VS: Do not print message when generate.stamp is up-to-date.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3054
2019-03-06 08:37:14 -05:00
Brad King fb744ed49c Merge topic 'fix-override'
c9d2e1cee0 Fix missing `override`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3061
2019-03-06 08:36:17 -05:00
Brad King 809890e3f6 Merge topic 'issue-18883-support-for-multiple-targets'
324d18bb34 cmake: Teach --build mode to support multiple targets
ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand
fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct
b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help
f1367c8c51 cmGlobalGenerator: Remove unused code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2939
2019-03-06 08:32:39 -05:00
Kitware Robot 28186bd2ba CMake Nightly Date Stamp 2019-03-06 00:01:06 -05:00
Gregor Jasny 1166aa5ce7 ctest: refactor some code 2019-03-05 19:20:29 +01:00
Olli Kallioinen 67428e9025 VS: Do not print message when generate.stamp is up-to-date.
Fixes: #16783
2019-03-05 11:20:42 -05:00
Brad King 451d3907fd Merge topic 'restore_broken_curses_gui'
aa68ce6bd4 ccmake: fix curses dialog broken by refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Artur Ryt <artur.ryt@gmail.com>
Merge-request: !3055
2019-03-05 09:04:46 -05:00
Brad King 168c11f70e Merge topic 'fix_autorcc_for_qt6'
bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3049
2019-03-05 09:04:06 -05:00
Bartosz Kosiorek 324d18bb34 cmake: Teach --build mode to support multiple targets
Fixes: #16136
2019-03-05 08:55:28 -05:00
Kitware Robot 4b3a739800 CMake Nightly Date Stamp 2019-03-05 00:01:20 -05:00
Vitaly Stakhovsky c9d2e1cee0 Fix missing override 2019-03-04 19:55:31 -05:00
Felix Schwitzer aa68ce6bd4 ccmake: fix curses dialog broken by refactoring
During refactoring in commit f6291eee25 (cmCursesMainForm: Modernize
with STL and ranged-for loops, 2019-02-10) a transformation of a loop
went wrong and editing the cmake cache with ccmake no longer works.
Make ccmake work again.

Fixes: #19008
2019-03-04 09:12:41 -05:00
Brad King 6873e98486 Merge topic 'llvm-rc'
e53a968ed5 MSVC: Use -D instead of /D in RC_FLAGS
1a281a1acd RC: Pass output file in a way that llvm-rc 7 and below understand
fa339ced67 CMakeVersion.rc: Avoid preprocessor definitions to support llvm-rc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3007
2019-03-04 08:42:49 -05:00
Brad King dbd3b1ac90 Merge topic 'vs-fortran-rc'
0b82f56ac6 VS: Fix Fortran target type selection with RC sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3050
2019-03-04 08:35:46 -05:00
Alexandru Croitor bb97a377dd Autogen: Fallback on internal qrc parser when RCC isn't built yet
When building a Qt project, the AUTORCC functionality, by default,
uses the rcc binary to get the contents of a qrc file for
dependency information. This is done at CMake "generate" time.

The problem is that while configuring Qt itself, the rcc binary is
not built yet.
In that case, to get the contents of the qrc file, fall back to
the code branch which uses an ifstream instead of the rcc binary.
2019-03-04 12:45:16 +01:00
Bartosz Kosiorek ebc94500c1 cmGlobalGenerator: Optimize Printable() method from GeneratedMakeCommand 2019-03-04 10:44:15 +01:00
Bartosz Kosiorek fdeb364a84 cmGlobalGenerator: Change case of methods from GeneratedMakeCommand struct 2019-03-04 10:44:14 +01:00
Bartosz Kosiorek b3955a08ab cmakemain: Remove ignored --use-stderr option from command line help 2019-03-04 10:44:14 +01:00