mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 07:08:38 -05:00
Code Issues Packages Projects Releases Wiki Activity
46,452 Commits 2 Branches 401 Tags
941c09616bc214db77e3b1b7e5229517db08b45c
Commit Graph

46452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 941c09616b Merge topic 'multi-ninja-pch' 
a55df20499 Multi-Ninja: Add precompile headers support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4201
 2020-01-20 11:59:28 -05:00
Brad King 56a3e84a67 Merge topic 'realpath-cache' 
9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4220
 2020-01-20 11:55:04 -05:00
Brad King a44b83c138 Merge branch 'release-3.16' 2020-01-20 11:54:13 -05:00
Brad King 6a5a23ea92 Merge topic 'autogen_rcc_skip_unity' 
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4237
 2020-01-20 11:54:13 -05:00
Brad King b168d8e855 Merge topic 'autogen_rcc_skip_unity' into release-3.16 
086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4237
 2020-01-20 11:54:13 -05:00
Brad King bf3142e253 Merge topic 'fphsa-name-mismatch' 
be4d1bdf9a FPHSA: acknowledge the name mismatches in CMake-owned modules
ee4673c1ae FPHSA: detect package name mismatches

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Eric Noulard <eric.noulard@gmail.com>
Merge-request: !4123
 2020-01-20 11:53:14 -05:00
Brad King 9b9dfacaa5 Merge topic 'acc-fix-in-source-depends-path' 
ba3a417dce Tests/CustomCommand: add a test for depending on a `./path`
e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output
db4780d584 cmGeneratorTarget: search for relative paths to the binary directory
ec479f101f cmLocalGenerator: collapse the path after construction
fd0ba705ce add_custom_command: check if a relative path should be an in-source path
fd84f510f8 cmLocalGenerator: simplify the current source dir query

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4195
 2020-01-20 11:52:00 -05:00
Brad King ac59da4c6a Merge topic 'stl-support' 
b9a3f2e7e2 STL Support: enhance behavior of cm::dynamic_reference_cast
04c2f67492 STL Support: extends type_traits for future developments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4216
 2020-01-20 11:51:07 -05:00
Kitware Robot 5e38b8f608 CMake Nightly Date Stamp 2020-01-20 00:01:13 -05:00
Craig Scott 582cc710c2 Merge topic 'pch-msvc-no-path-repetition' into release-3.16 
07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4236
 2020-01-19 15:10:17 -05:00
Craig Scott 3452f2d4c2 Merge branch 'release-3.16' 2020-01-19 15:10:17 -05:00
Craig Scott 6bd07b9de1 Merge topic 'pch-msvc-no-path-repetition' 
07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4236
 2020-01-19 15:10:17 -05:00
Kitware Robot cd08cb7b8c CMake Nightly Date Stamp 2020-01-19 00:01:08 -05:00
Kitware Robot 5b4b808cb4 CMake Nightly Date Stamp 2020-01-18 00:01:15 -05:00
Cristian Adam a55df20499 Multi-Ninja: Add precompile headers support 
Fixes: #19789
 2020-01-17 23:17:35 +01:00
Sebastian Holtermann 086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files 
`rcc` generated files are not compatible with unity builds, because they
contain classes in anonymous namespaces and static data with identical names.

This patch sets the source file property `SKIP_UNITY_BUILD_INCLUSION` to `On`
on all `AUTORCC` generated files to exclude them from unity build files.

Fixes: #20191 "QT5: Exclude resource files from unity build"
 2020-01-17 09:48:35 -05:00
Brad King 93d4148612 Merge topic 'step5' 
fc2d1b1347 Tutorial: Clarify Step 5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4231
 2020-01-17 09:42:32 -05:00
Brad King a7fca06c46 Merge topic 'out-of-dir-link-list' 
f0e67da061 target_link_libraries: Fix out-of-dir linking of a list of targets
acee629103 cmTargetLinkLibrariesCommand: Move HandleLibrary to helper struct
ba675f1ecc Tests: Enable CMP0022 in ExportImport out-of-dir linking case

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4226
 2020-01-17 09:41:10 -05:00
Brad King cd6f6b2a9f Merge topic 'cmake-ctest-arguments' 
4153d8445b Add CMAKE_CTEST_ARGUMENTS variable to pass command-line arguments to ctest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4168
 2020-01-17 09:40:23 -05:00
Brad King 796d66438b Merge topic 'rename-cross-config-variable' 
310b58e961 Ninja Multi-Config: Rename variable to be more consistent

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4234
 2020-01-17 09:39:32 -05:00
Brad King 85e959b727 Merge topic 'feature/cmSourceFile-avoid-unnecessary-copy' 
5da3d01fd1 cmSourceFile: avoid unnnecessary copies

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4233
 2020-01-17 09:38:45 -05:00
Brad King f80437ad34 Merge topic 'csharp-default-langversion' 
2e882b4275 CSharp: Set C# compiler to default version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4232
 2020-01-17 09:37:57 -05:00
Brad King 7dad7ea4ac Merge branch 'release-3.16' 2020-01-17 09:25:24 -05:00
Brad King 9409ea2c4e Merge topic 'findopenssl-dependencies-link-order' 
d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4235
 2020-01-17 09:25:24 -05:00
Brad King 4c907eae69 Merge topic 'findopenssl-dependencies-link-order' into release-3.16 
d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4235
 2020-01-17 09:25:23 -05:00
Craig Scott 808888aa47 Merge topic 'cpack-custom-dmg-names' 
6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME
b53230fbee Tests: Add DragNDrop as a testable CPack generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4227
 2020-01-17 08:33:01 -05:00
Marc Chevrier b9a3f2e7e2 STL Support: enhance behavior of cm::dynamic_reference_cast 
Ensure cm::dynamic_reference_cast has same behavior as dynamic_cast
on reference: raise std::bad_cast if dynamic_cast is not possible.
 2020-01-17 11:09:53 +01:00
Marc Chevrier 04c2f67492 STL Support: extends type_traits for future developments 2020-01-17 11:09:48 +01:00
Kitware Robot c9836f8a88 CMake Nightly Date Stamp 2020-01-17 00:01:14 -05:00
Betsy McPhail fc2d1b1347 Tutorial: Clarify Step 5 2020-01-16 15:54:01 -05:00
Ben Boeckel ba3a417dce Tests/CustomCommand: add a test for depending on a ./path 2020-01-16 13:56:30 -05:00
Ben Boeckel e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output 2020-01-16 13:56:30 -05:00
Ben Boeckel db4780d584 cmGeneratorTarget: search for relative paths to the binary directory 
Dependencies in the form `./somepath.txt` are not found otherwise
because we only match on last-path-component searches and `.` never
shows up in a full path as a full component.
 2020-01-16 13:56:30 -05:00
Ben Boeckel ec479f101f cmLocalGenerator: collapse the path after construction 
The path may contain `..` or `.` components naïvely, so compute them out
before letting the generator handle them.
 2020-01-16 13:56:30 -05:00
Ben Boeckel fd0ba705ce add_custom_command: check if a relative path should be an in-source path 
This still is broken for dependencies on generated paths where they get
generated to the source directory rather than the build directory
however, but there's no way to determine that is the case.

Fixes: #20194
 2020-01-16 13:54:26 -05:00
Ben Boeckel fd84f510f8 cmLocalGenerator: simplify the current source dir query 2020-01-16 13:54:25 -05:00
Brad King f0e67da061 target_link_libraries: Fix out-of-dir linking of a list of targets 
In a case like

    target_link_libraries(targetInOtherDir PUBLIC "$<1:a;b>")

then all entries in the list need to be looked up in the caller's
scope.  Previously our `::@(directory-id)` suffix would apply only
to the last entry.  Instead surround the entire entry by a pair
`::@(directory-id);...;::@` so that the `::@` syntax can encode
a directory lookup scope change evaluated as the list is processed.

Fixes: #20204
 2020-01-16 13:24:27 -05:00
Brad King acee629103 cmTargetLinkLibrariesCommand: Move HandleLibrary to helper struct 2020-01-16 11:53:52 -05:00
Cristian Adam 07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case) 
Fixes: #19952
 2020-01-16 17:05:05 +01:00
Andrew Fuller 6d6f4b9316 CPack/DragNDrop: Support CPACK_DMG_<component>_FILE_NAME 2020-01-16 08:04:35 -08:00
Andrew Fuller b53230fbee Tests: Add DragNDrop as a testable CPack generator 2020-01-16 08:04:35 -08:00
Brad King 3a5cc52f07 Merge branch 'release-3.16' 2020-01-16 10:56:03 -05:00
Brad King b2edb72642 Merge topic 'nag-submodule' 
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4229
 2020-01-16 10:56:03 -05:00
Brad King 8cd35baae9 Merge topic 'nag-submodule' into release-3.16 
f7f60ddcf9 Fortran: Add support for NAG Fortran submodules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4229
 2020-01-16 10:56:02 -05:00
Ashley Whetter d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags 
Fixes: #20082, #20224
 2020-01-16 10:53:19 -05:00
Brad King 2a850232fc Merge topic 'cpack-nsis-test' 
b796749ba8 Tests: Fix CPackNSISGenerator test on non-x86 Windows platforms

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4230
 2020-01-16 10:40:56 -05:00
Kyle Edwards 310b58e961 Ninja Multi-Config: Rename variable to be more consistent 
Also make some tweaks to the documentation.
 2020-01-16 10:34:43 -05:00
Brad King 05738b5f21 Merge topic 'pch_job_pool' 
97c124e30f Ninja: Add a separate job pool for PCH creation
ebd0b16ddb vim: Add target_precompile_headers command highlighting

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Cristian Adam <cristian.adam@gmail.com>
Merge-request: !4224
 2020-01-16 10:33:48 -05:00
Dan Johnston 97c124e30f Ninja: Add a separate job pool for PCH creation 
Add a `JOB_POOL_PRECOMPILE_HEADER` target property to specify the pool
name, and its associated `CMAKE_JOB_POOL_PRECOMPILE_HEADER` variable.

Fixes: #20217
 2020-01-16 10:32:25 -05:00
Dan Johnston ebd0b16ddb vim: Add target_precompile_headers command highlighting 2020-01-16 10:29:26 -05:00