mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 06:09:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
50,444 Commits 2 Branches 401 Tags
d22a760cb9f839eefb56051482dbb5f589ee9ff7
Commit Graph

50444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot d22a760cb9 CMake Nightly Date Stamp 2020-10-26 00:01:06 -04:00
Kitware Robot d749d46814 CMake Nightly Date Stamp 2020-10-25 00:01:04 -04:00
Kitware Robot a8e9208f70 CMake Nightly Date Stamp 2020-10-24 00:01:19 -04:00
Brad King 5988a4deea Merge topic 'no-override-flow-control' 
8aee7fdb32 cmState: Prohibit override of flow control commands

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5409
 2020-10-23 09:06:03 -04:00
Brad King 31848e35a7 Merge topic 'proper-command-nesting' 
12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements
67383725bd cm::optional: Add constructor delegation to nullopt_t constructor
0668120398 cm::optional: Fix move assignment

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5401
 2020-10-23 09:05:13 -04:00
Brad King b91dd2c639 Merge topic 'ctest-hostname-cleanup' 
11d21c1c4e CTest: Avoid invoking external tool to get the host name
3f3762856f Tests: Add case verifying CTest module SITE variable
94c6295db1 Help: Document site_name command use of HOSTNAME variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5407
 2020-10-23 09:02:37 -04:00
Brad King a541921c56 Merge topic 'FindGTest-config-mode' 
2327b4330c FindGTest: Added support for CONFIG mode
6d45f951ed FindGTest: Minor whitespace change, moved an include upwards
98d5f033ed FindGTest: Ensure target names follow upstream GTest
585cc7c930 ci: install gmock in the Fedora 31 image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5404
 2020-10-23 09:01:00 -04:00
Brad King d11338dba1 Merge branch 'release-3.19' 2020-10-23 08:44:48 -04:00
Brad King bc0c72f1f0 Merge topic 'vs-fortran-debugging-flags' 
8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5406
 2020-10-23 08:44:48 -04:00
Brad King f2a59d400e Merge topic 'vs-fortran-debugging-flags' into release-3.19 
8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5406
 2020-10-23 08:44:47 -04:00
Craig Scott e4b92b4378 Merge branch 'release-3.19' 2020-10-23 06:37:57 -04:00
Craig Scott 5e1858c0c2 Merge topic 'cmake-presets-toolset-arch-config' into release-3.19 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott dbd1d737f9 Merge topic 'cmake-presets-toolset-arch-config' 
64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5387
 2020-10-23 06:37:56 -04:00
Craig Scott 3bc4dc07e9 Merge branch 'release-3.19' 2020-10-23 06:36:04 -04:00
Craig Scott 761dc324e0 Merge topic 'cmake-presets-source-dir-name' into release-3.19 
25742c589c CMakePresets.json: Add ${sourceDirName} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5386
 2020-10-23 06:36:03 -04:00
Craig Scott 5d20e6d803 Merge topic 'cmake-presets-source-dir-name' 
25742c589c CMakePresets.json: Add ${sourceDirName} macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: Craig Scott <craig.scott@crascit.com>
Merge-request: !5386
 2020-10-23 06:36:03 -04:00
Kitware Robot 6d306a42da CMake Nightly Date Stamp 2020-10-23 00:01:14 -04:00
Kyle Edwards 8aee7fdb32 cmState: Prohibit override of flow control commands 2020-10-22 17:04:31 -04:00
Kyle Edwards 3a82ff6a11 Merge topic 'cmake-16773' 
3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5405
 2020-10-22 12:00:39 -04:00
Kyle Edwards 12f6e37eb7 cmListFileCache: Enforce proper nesting of flow control statements 
Fixes: #19153
 2020-10-22 11:40:48 -04:00
Kyle Edwards 67383725bd cm::optional: Add constructor delegation to nullopt_t constructor 
Some static analysis tools incorrectly identify this constructor
as leaving _has_value in an undefined state. Explicitly call the
default constructor to force _has_value to false.
 2020-10-22 11:40:48 -04:00
Kyle Edwards 64afabdbcb CMakePresets.json: Split cmakeGeneratorConfig field 
Make this field separate for both architecture and toolset. Allow
architecture and toolset to be either strings or objects with value
and strategy fields.

Fixes: #21317
 2020-10-22 11:24:39 -04:00
Kyle Edwards 25742c589c CMakePresets.json: Add ${sourceDirName} macro 
Fixes: #21312
 2020-10-22 11:09:28 -04:00
Kyle Edwards 609122007d Merge topic 'cmake-presets-invalid-macro' into release-3.19 
638557cbfe CMakePresets.json: Properly report macro expansion errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
 2020-10-22 11:05:09 -04:00
Kyle Edwards 34990a9e3d Merge branch 'release-3.19' 2020-10-22 11:05:09 -04:00
Kyle Edwards 5ef9978087 Merge topic 'cmake-presets-invalid-macro' 
638557cbfe CMakePresets.json: Properly report macro expansion errors

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5397
 2020-10-22 11:05:09 -04:00
Kyle Edwards 3e74f89e3f Merge branch 'release-3.19' 2020-10-22 11:04:19 -04:00
Kyle Edwards 6abe14d226 Merge topic 'cmake-presets-boolean-cache' 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:19 -04:00
Kyle Edwards 6af1185bb4 Merge topic 'cmake-presets-boolean-cache' into release-3.19 
920d180047 CMakePresets.json: Allow boolean for cache variable value

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5398
 2020-10-22 11:04:18 -04:00
Brad King 11d21c1c4e CTest: Avoid invoking external tool to get the host name 
Populate the SITE cache entry using an internal query instead.
 2020-10-22 10:49:17 -04:00
Brad King 3f3762856f Tests: Add case verifying CTest module SITE variable 2020-10-22 10:20:43 -04:00
Brad King 94c6295db1 Help: Document site_name command use of HOSTNAME variable 2020-10-22 10:20:43 -04:00
Mario Emmenlauer 2327b4330c FindGTest: Added support for CONFIG mode 
Upstream GTest provides its own CMake package files.  Use them if
available.

Fixes: #18801
 2020-10-22 09:32:36 -04:00
Mario Emmenlauer 6d45f951ed FindGTest: Minor whitespace change, moved an include upwards 2020-10-22 09:32:23 -04:00
Mario Emmenlauer 98d5f033ed FindGTest: Ensure target names follow upstream GTest 2020-10-22 09:32:19 -04:00
Brad King 585cc7c930 ci: install gmock in the Fedora 31 image 
The gmock libraries are referenced by GTest's CMake package files.

While at it, also explicitly install gettext.  It is installed already,
but make it explicit for future testing of the FindGettext module.
 2020-10-22 09:32:18 -04:00
Volker Jacht 8ad6fabfc5 VS: Remove flag table entries for Fortran /Z* flags 
These were included when the Fortran flag table was first created by
commit 10c91ded4f (ENH: add support for Intel Fortran Visual studio IDE,
2008-04-30, v2.8.0~2227), but they map to fields not actually supported
by the IDE.  Remove their table entries.

Instead use just `/debug:minimal` and `/debug:full` to control debug
information level in VS Intel Fortran.  Let flags like `/Z7` pass
through as raw additional options because they have no corresponding IDE
property and can be used to complement the supported options.

Fixes: #21340
 2020-10-22 09:08:52 -04:00
Brad King 504aadf414 Merge topic 'move_pch_information_to_projects_where_possible' 
9df1f33c9a VisualStudio: move PCH rules to projects when possible.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5395
 2020-10-22 08:51:46 -04:00
Kitware Robot 3870f57ac5 CMake Nightly Date Stamp 2020-10-22 00:01:13 -04:00
Kyle Edwards 0668120398 cm::optional: Fix move assignment 2020-10-21 14:23:43 -04:00
Kyle Edwards 920d180047 CMakePresets.json: Allow boolean for cache variable value 
Fixes: #21327
 2020-10-21 10:37:08 -04:00
Brad King ccd313a074 Merge topic 'constify' 
bd705788f6 Constify some code as suggested by clang-tidy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5391
 2020-10-21 10:19:47 -04:00
Kyle Edwards 638557cbfe CMakePresets.json: Properly report macro expansion errors 
Make a distinction between strings which simply use the
$vendor{<...>} macro, which is valid but makes it unusable by CMake,
and strings which actually contain invalid macro expansions.

Fixes: #21308
 2020-10-21 09:20:52 -04:00
Kyle Edwards 9367a7a6d5 Merge branch 'release-3.19' 2020-10-21 09:15:30 -04:00
Kyle Edwards ec3b3d2c2f Merge topic 'cmakepresets-schema' into release-3.19 
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
 2020-10-21 09:15:29 -04:00
Kyle Edwards 1a03e1bb01 Merge topic 'cmakepresets-schema' 
cf6ac2d365 Merge branch 'master' into cmakepresets-schema
21bc2fd945 CI: Install jsonschema for schema testing
e3bce8edf4 Tests: Add JSON schema validation to CMakePresets.json tests
0307f7c980 Help: Add JSON schema for CMakePresets.json

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5366
 2020-10-21 09:15:29 -04:00
Asit Dhal 3c324689a7 include: refactor call sites of cmMakefile::ReadDependentFile 
Fixes: #16773
 2020-10-21 11:20:37 +02:00
Kitware Robot 7398b4783e CMake Nightly Date Stamp 2020-10-21 00:01:17 -04:00
Brad King e59c8f548d Merge topic 'ci-win-python' into release-3.19 
8f7fef629b ci: add Python to PATH on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !5403
 2020-10-20 15:59:20 -04:00
Brad King ef9030a94f Merge branch 'release-3.19' 2020-10-20 15:59:20 -04:00