reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2025-02-16 01:28:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
47,058 Commits 4 Branches 185 Tags
Commit Graph

47058 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
471ebc590e Merge branch 'upstream-librhash' into update-librhash 
* upstream-librhash:
  librhash 2019-12-14 (75716b45)
 2020-03-02 16:58:34 -05:00
librhash upstream
641cc0030c librhash 2019-12-14 (75716b45) 
Code extracted from:

    https://github.com/rhash/rhash.git

at commit 75716b45c21416c98c0ab2e3c2735b150e7afb03 (v1.3.9).
 2020-03-02 16:31:07 -05:00
Brad King
74f1a64572 librhash: Update import script to get rhash 1.3.9 2020-03-02 16:31:01 -05:00
Brad King
6e9eaca24f Merge branch 'release-3.17' 2020-03-02 15:30:44 -05:00
Brad King
d1cb554c99 CMake 3.17.0-rc2 v3.17.0-rc2 2020-03-02 14:15:14 -05: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
f32d41d295 Merge topic 'CheckTypeSize-ppc64' 
a09d646b7c CheckTypeSize: Fix '..._CODE' result for ppc and ppc64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4413
 2020-03-02 10:48:41 -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
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
Brad King
a09d646b7c CheckTypeSize: Fix '..._CODE' result for ppc and ppc64 
Check for ppc64 macros before plain ppc.  Consider both upper and lower
case variants because some compilers have only one of them.

Fixes: #20368
 2020-02-28 13:57:31 -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
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
210b0b99a9 XL: Fix using Fortran modules from their output directory 
The XL Fortran compiler's `-qmoddir=` flag sets the module output
directory but does not add the directory to the search path for using
modules.  This is inconsistent with other compilers like the GNU Fortran
compiler's `-J` flag that does both.  In order to make these consistent,
add the module output directory with a `-I` flag on the XL Fortran
compiler so that it will be searched when using modules too.

This fixes our `FortranModules` test's coverage of submodules on
Ninja + XL.  That test places module files in a subdirectory that with
Ninja is not the current working directory when the compiler runs.

Fixes: #20400
 2020-02-28 10:37:11 -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