mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-10 07:40:03 -06:00
Code Issues Packages Projects Releases Wiki Activity
47,352 Commits 2 Branches 385 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph

7271 Commits

Author SHA1 Message Date
Cristian Adam
598b676b5e cmake_command: Add command to EVAL a CMake script as a string 2020-03-03 08:42:13 -05:00
Marc Chevrier
0c97b73bc0 FindPython: python_add_library can now manage SOABI suffix. 
Fixes: #20408
 2020-03-03 13:13:48 +01:00
Brad King
02556d850b Merge topic 'test_output' 
1ae9ddbb9d Tests: Output the expected value in Preprocess test for debugging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4410
 2020-03-02 10:49:25 -05:00
Brad King
178a166ae1 Merge topic 'xl-fortran-module-dir-use' 
92785ed746 Tests: Enable Fortran submodule tests on XL compilers
210b0b99a9 XL: Fix using Fortran modules from their output directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4405
 2020-03-02 10:48:05 -05:00
Brad King
813b505c67 Merge topic 'CheckFortranSource-def' 
1bc521416f CheckFortranSource*: Avoid passing -DVAR to linker

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4406
 2020-03-02 10:47:11 -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
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
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
Francisco Facioni
1ae9ddbb9d Tests: Output the expected value in Preprocess test for debugging 2020-02-28 11:07:38 -05:00
Brad King
1bc521416f CheckFortranSource*: Avoid passing -DVAR to linker 
The test project is compiled with a `-DVAR` compiler flag where `VAR` is
the result variable.  Tell `try_compile` to add the flag through
`add_definitions` instead of `CMAKE_Fortran_FLAGS` so that it is not
used for linking.  Otherwise some Fortran compilers (e.g. XL 15) do not
like the flag when used to drive linking.
 2020-02-28 10:57:45 -05:00
Brad King
92785ed746 Tests: Enable Fortran submodule tests on XL compilers 
Since commit b66bc6606e (Tests: Add Fortran submodule tests, 2016-09-22,
v3.7.0-rc1~55^2) we try a small test program to see if the Fortran
compiler supports submodules.  However, a typo in the test program
caused it to fail on XL with the error:

    1513-083 (E) Internal or module function id was not set within the function.

Fix the typo so that the check passes and enables the submodule tests
with XL compilers.
 2020-02-28 10:37:11 -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
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
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
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
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
ab2d170c74 Merge topic 'CPackRPM-trans-scripts' 
c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4387
 2020-02-26 08:52:09 -05:00
Brad King
d13489fe2b Merge topic 'RunCMake-test-lang' into release-3.17 
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4389
 2020-02-26 07:42:23 -05:00
Brad King
0b903779e8 Merge topic 'RunCMake-test-lang' 
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4389
 2020-02-26 07:42:23 -05:00
Rolf Eike Beer
95dbcf0598 Tests: fix RunCMake.Make test when run on systems with non-english locale 
Set `LANG=C` in the environment so the output of `make` is predictable.

Fixes: #19689
 2020-02-26 07:41:07 -05:00
Brad King
919d793842 Merge topic 'ninja-multi-fix-macos-failures' 
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4396
 2020-02-26 07:32:58 -05:00
Marc Chevrier
facadf6c30 Merge topic 'swig-fortran' 
a1909e26ac UseSWIG: Enable SWIG Fortran target language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4380
 2020-02-25 17:19:51 -05:00
Kyle Edwards
cc4e304800 Tests: Fix CFBundleTest for Ninja Multi-Config 2020-02-25 13:39:46 -05:00
Kyle Edwards
bcf4da52d8 Tests: Fix CustComDepend test for Ninja Multi-Config 2020-02-25 13:39:46 -05:00
Cristian Adam
54e4f2ad45 cmake_command: Add command to INVOKE other commands by name 
Fixes: #18392
 2020-02-25 13:14:17 -05:00
Alexander Boczar
7c944da757 VS: Add target property to explicitly control solution deployment 
Add a `VS_SOLUTION_DEPLOY` property to control solution deploy mark.

Fixes: #20346
 2020-02-25 10:24:23 -05:00
Brad King
d5e7bb1b4b Merge topic 'ctest-failure-error-reporting' 
a5be3916ee CTest: Provide more detailed information on resource allocation error
f0df3ed5b9 Refactor: Provide more detailed error information from TryAllocateResources()
f1c34443b7 CTest: Improve error reporting with bad working directory for tests
1dec359422 Refactor: Require detail when calling cmCTestRunTest::StartFailure()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4390
 2020-02-25 09:00:25 -05:00
Kyle Edwards
a5be3916ee CTest: Provide more detailed information on resource allocation error 2020-02-24 15:44:01 -05:00
Sarang Joshi
c0534c4a68 CPackRPM: Add PRE_/POST_TRANS scripts 
Add variables for PRE_TRANS and POST_TRANS scripts.

Fixes: #18917
 2020-02-24 14:31:38 -05:00
Seth R Johnson
a1909e26ac UseSWIG: Enable SWIG Fortran target language 2020-02-24 12:15:48 -05:00
Cristian Adam
6ec274b002 execute_process: Add ECHO_(OUTPUT|ERROR)_VARIABLE options 
Fixes: #20378
 2020-02-24 14:44:14 +01:00
Kyle Edwards
5395bf05eb string: Add new HEX sub-command 2020-02-19 09:11:05 -05:00
Brad King
a0318e8fc8 Merge topic 'deprecate-policy-old' 
c78ae16d81 Add deprecation warnings for policies CMP0071 and below

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4369
 2020-02-18 11:24:15 -05:00
Brad King
2dad438980 Merge topic 'ninja-multi-framework-dependency-autogen-fix' into release-3.17 
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4363
 2020-02-18 11:20:56 -05:00
Brad King
2ee4b288ad Merge topic 'ninja-multi-framework-dependency-autogen-fix' 
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix
7abc3d61ac Ninja Multi-Config: Fix issue with framework dependencies and Autogen

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4363
 2020-02-18 11:20:56 -05:00
Brad King
c78ae16d81 Add deprecation warnings for policies CMP0071 and below 
The OLD behaviors of all policies are deprecated, but only by
documentation.  Add an explicit deprecation diagnostic for policies
introduced in CMake 3.10 and below to encourage projects to port away
from setting policies to OLD.
 2020-02-17 11:44:57 -05:00
Kyle Edwards
665c8fde8b Merge branch 'backport-ninja-multi-framework-dependency-autogen-fix' into ninja-multi-framework-dependency-autogen-fix 2020-02-17 10:51:48 -05:00
Brad King
0557e0b866 Merge topic 'git-config-with-spaces' 
ef3194a6f8 ExternalProject: Quote each git --config option to handle spaces
40d1d29cfa Tests: Add missing ExternalProject smoke tests
afc8956765 Tests: Fix test_clean target missing some test directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4364
 2020-02-17 10:39:46 -05:00
Brad King
b782fc9390 Merge topic 'makefiles-deep-configure' 
e46e3442fd Makefiles: Re-run CMake if file configured in subdirectory is missing

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