Commit Graph

47044 Commits

Author SHA1 Message Date
Kitware Robot d016637eef CMake Nightly Date Stamp 2020-03-02 00:01:08 -05:00
Kitware Robot 61596e1cc8 CMake Nightly Date Stamp 2020-03-01 00:01:04 -05:00
Kitware Robot be2f34b9c1 CMake Nightly Date Stamp 2020-02-29 00:01:10 -05:00
Brad King b78a68f98b Merge topic 'csharp-out-of-source-groups'
ac6b18cd90 CSharp: Add support for source groups with out-of-source builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4374
2020-02-28 14:15:56 -05:00
Kinan Mahdi ac6b18cd90 CSharp: Add support for source groups with out-of-source builds
This also fixes support for multiple sources of the same name in
different directories.  Add a test for both problems.

Issue: #19505
2020-02-28 11:42:01 -05:00
Brad King 0842a3d030 Merge topic 'modernize-memory-management'
557cecdc3d Modernize memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4402
2020-02-28 11:39:44 -05:00
Brad King fb377ab5ef Merge topic 'FortranCInterface-cross-compile'
8e2683cf6d FortranCInterface: Fix broken search for test exe when cross-compiling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4404
2020-02-28 11:36:10 -05:00
Brad King d65a6dd897 Merge branch 'release-3.17' 2020-02-28 11:32:07 -05:00
Brad King f18c72815b Merge topic 'ninja-multi-variable-shuffle-again'
c794b70f19 Ninja Multi-Config: Always generate build.ninja
9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators
7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4403
2020-02-28 11:32:07 -05:00
Brad King 5f36f1027b Merge topic 'ninja-multi-variable-shuffle-again' into release-3.17
c794b70f19 Ninja Multi-Config: Always generate build.ninja
9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators
7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4403
2020-02-28 11:32:06 -05:00
Brad King 9afd5f0d32 Merge branch 'release-3.17' 2020-02-28 11:15:31 -05:00
Brad King d61a99c3ca Merge topic 'foreach-range-issues'
185d1aefaa foreach: Set fatal error on invalid range
a33b3949e5 foreach: Fix crash when parsing invalid integer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4407
2020-02-28 11:15:31 -05:00
Brad King 18c8fbcb0b Merge topic 'foreach-range-issues' into release-3.17
185d1aefaa foreach: Set fatal error on invalid range
a33b3949e5 foreach: Fix crash when parsing invalid integer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4407
2020-02-28 11:15:30 -05:00
Brad King 402516c724 Merge branch 'release-3.17' 2020-02-28 11:14:34 -05:00
Brad King e46f579637 Merge topic 'q_namespace_export'
426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4398
2020-02-28 11:14:34 -05:00
Brad King 15ac1f671b Merge topic 'q_namespace_export' into release-3.17
426941c433 Autogen: Recognize the new Q_NAMESPACE_EXPORT macro in AUTOMOC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4398
2020-02-28 11:14:33 -05:00
Kitware Robot 2caae28172 CMake Nightly Date Stamp 2020-02-28 00:01:10 -05:00
Brad King 4aa2e7ace3 Merge topic 'tutorial-have-log-and-exp'
07223c5c27 Tutorial: Update Step 5 to work on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4375
2020-02-27 15:00:11 -05:00
Betsy McPhail 07223c5c27 Tutorial: Update Step 5 to work on Windows
`log` and `exp` should be found on Windows systems now, as expected.

Update tests to be more specific in looking for the expected outcome of
the tutorial.
2020-02-27 14:58:24 -05:00
Kyle Edwards 185d1aefaa foreach: Set fatal error on invalid range
Fixes: #20394
2020-02-27 14:52:06 -05:00
Kyle Edwards a33b3949e5 foreach: Fix crash when parsing invalid integer
Fixes: #20393
2020-02-27 14:52:06 -05:00
Brad King 2a9cf88917 Merge topic 'Genex-LINK_LANGUAGE'
461efa7b51 Genex: Add $<LINK_LANGUAGE:...> and $<LINK_LANG_AND_ID:...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4244
2020-02-27 11:18:28 -05:00
Brad King 8e2683cf6d FortranCInterface: Fix broken search for test exe when cross-compiling
Previously the `find_program` call we used to locate the test executable
but that can be broken by `CMAKE_FIND_ROOT_PATH_MODE_PROGRAM`.  Instead
teach the test project to write a file with the location of the
executable it builds.  Load that file to get the exact location.

Fixes: #20390
2020-02-27 11:09:25 -05:00
Kyle Edwards c794b70f19 Ninja Multi-Config: Always generate build.ninja
If CMAKE_DEFAULT_BUILD_TYPE is not specified, use the first item
from CMAKE_CONFIGURATION_TYPES instead.
2020-02-27 10:39:35 -05:00
Brad King c58b9c5ab9 Merge topic 'cmake_command-command'
54e4f2ad45 cmake_command: Add command to INVOKE other commands by name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4286
2020-02-27 10:21:21 -05:00
Brad King d6fa231127 Merge topic 'execute_process_exclusive_capture'
6ec274b002 execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !4383
2020-02-27 09:53:07 -05:00
Brad King b24d02fa7a Merge topic 'gen-tgt'
d98064f156 Help: cmake-generator-expressions(7): Target-Dependent Queries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4378
2020-02-27 09:52:19 -05:00
Brad King a3105d7150 Merge topic 'doc-cpack-ifw'
1af49def54 Help: CPackIFW generator: offline installer

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4379
2020-02-27 09:51:25 -05:00
Kyle Edwards 9590c3a400 Generator: Don't allow Ninja Multi-Config variables on other generators
We may want to enable these variables later on with specific
semantics. To avoid breaking backwards compatibility, make it an
error to use them for now.
2020-02-27 09:23:08 -05:00
Kyle Edwards 7a63dafafb Ninja Multi-Config: Remove "NMC" from variable names
Also rename `..._DEFAULT_BUILD_FILE_CONFIG` to `..._DEFAULT_BUILD_TYPE`.
These name changes make the variables meaningful for future use by other
generators.
2020-02-27 09:22:08 -05:00
Brad King 813b289023 Merge topic 'pch-file-time' into release-3.17
7e9b9fe918 PCH: Copy the timestamp from an absolute header file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4400
2020-02-27 08:48:49 -05:00
Brad King 4e0aebebd8 Merge branch 'release-3.17' 2020-02-27 08:48:49 -05:00
Brad King 2b0c6c69c9 Merge topic 'pch-file-time'
7e9b9fe918 PCH: Copy the timestamp from an absolute header file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4400
2020-02-27 08:48:49 -05:00
Brad King e619d29e76 Merge topic 'update-kwsys' into release-3.17
06702acb28 KWSys: Terminal: Add st-256color to VT100 color support whitelist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4394
2020-02-27 08:46:04 -05:00
Brad King e04fce4705 Merge branch 'release-3.17' 2020-02-27 08:46:04 -05:00
Brad King 7e1f39f251 Merge topic 'update-kwsys'
cbb235efb9 Merge branch 'backport-kwsys-terminal-st' into update-kwsys
06702acb28 KWSys: Terminal: Add st-256color to VT100 color support whitelist
71764b88d6 Merge branch 'upstream-KWSys' into update-kwsys
4e8c4c7ebe KWSys 2020-02-25 (b14ce28a)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4394
2020-02-27 08:46:04 -05:00
Brad King f26a8c88ee Merge branch 'release-3.16' 2020-02-27 08:34:29 -05:00
Brad King 4e6b14c985 Merge branch 'backport-3.16-FindPython-cache-cleanup' into release-3.16
1dc524f2 FindPython: Do not cache computed result variables in CMake 3.16
602d1d82 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4399
2020-02-27 08:33:11 -05:00
Brad King e86e63053c Merge branch 'release-3.17' 2020-02-27 08:31:46 -05:00
Brad King ac23cfdee7 Merge topic 'FindPython-cache-cleanup'
42c6a1bfee FindPython: Do not cache computed result variables
a7b4516e1a FindPython: Mark non-public cache entries INTERNAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4393
2020-02-27 08:31:46 -05:00
Brad King b766d2ca77 Merge topic 'FindPython-cache-cleanup' into release-3.17
42c6a1bfee FindPython: Do not cache computed result variables
a7b4516e1a FindPython: Mark non-public cache entries INTERNAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4393
2020-02-27 08:31:45 -05:00
Marc Chevrier 557cecdc3d Modernize memory management
Update internals of various classes
2020-02-27 11:11:30 +01:00
Marc Chevrier 1679a60a6e Merge topic 'FindSWIG-components'
e131d9f974 FindSWIG: Add COMPONENTS support for SWIG target languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4384
2020-02-27 04:53:02 -05:00
Kitware Robot c7c17c5f74 CMake Nightly Date Stamp 2020-02-27 00:01:10 -05:00
Brad King 85c1b2b6dd Merge topic 'vs-sln-deploy'
7c944da757 VS: Add target property to explicitly control solution deployment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4357
2020-02-26 11:38:14 -05:00
Marc Chevrier 461efa7b51 Genex: Add $<LINK_LANGUAGE:...> and $<LINK_LANG_AND_ID:...>
This MR may help to solve issues #19757 and #18008

Fixes: #19965
2020-02-26 16:38:42 +01:00
Seth R Johnson e131d9f974 FindSWIG: Add COMPONENTS support for SWIG target languages
Newer versions of SWIG drop support for some target languages, and some
forks of SWIG (such as for Fortran and MATLAB) aren't supported by the
mainline version of SWIG.

Swig versions as old as 1.3.6 (circa 2001) and possibly older use the
same format for listing available wrappers "%-15s - Generate %s
wrappers", so component detection should be quite reliable.
2020-02-26 10:12:30 -05:00
Brad King 54d1268ed4 Merge branch 'release-3.17' 2020-02-26 10:09:25 -05:00
Brad King 7fa907eeff Merge topic 'backport-ctest-resource-allocation-doc'
3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4401
2020-02-26 10:09:25 -05:00
Brad King 93287e34bc Merge topic 'backport-ctest-resource-allocation-doc' into release-3.17
3bff839706 Help: Clarify that the CTest resource allocation feature doesn't oversubscribe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4401
2020-02-26 10:09:24 -05:00