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
51,248 Commits 2 Branches 401 Tags
cfd8a5ac1f443725342517ddbaee51692d8d0324
Commit Graph

51248 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Chevrier cfd8a5ac1f Makefiles: Add support of DEPFILE for add_custom_command 
Issue: #20286
Fixes: #21415
 2020-12-23 15:47:46 +01:00
Marc Chevrier a526f71266 cmGccDepfileReader: Add new function ensuring paths are valid 
And cmTransformDepfile now rely on this new function.
 2020-12-23 14:40:19 +01:00
Kitware Robot 8c9c338e5e CMake Nightly Date Stamp 2020-12-23 00:01:11 -05:00
Craig Scott c56d3bef3e Merge branch 'release-3.19' 2020-12-22 15:49:37 -05:00
Craig Scott 88eefaac04 Merge topic 'fc-relative-SOURCE_DIR' 
51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5641
 2020-12-22 15:49:37 -05:00
Craig Scott ce9a9e00a8 Merge topic 'fc-relative-SOURCE_DIR' into release-3.19 
51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5641
 2020-12-22 15:49:37 -05:00
Brad King 7340fd823f Merge branch 'release-3.19' 2020-12-22 13:49:29 -05:00
Brad King 3e05e26296 Merge topic 'test-ConfigSources-config' into release-3.19 
3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5643
 2020-12-22 13:49:29 -05:00
Brad King ddd52aac54 Merge topic 'test-ConfigSources-config' 
3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5643
 2020-12-22 13:49:29 -05:00
Brad King 440531e0f9 Merge topic 'external-project-drop-success' 
850de767e9 ExternalProject: Silence step succeeded message when using Ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5625
 2020-12-22 09:14:01 -05:00
Brad King 72a28635b8 Merge topic 'issue-20134' 
b68699b717 target_include_directories: Support AFTER option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5633
 2020-12-22 09:13:08 -05:00
Brad King 3cf1a8c59b Merge topic 'issue-15653' 
c3385dd8bd file(GENERATE): Support options to manipulate file permissions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5437
 2020-12-22 09:12:20 -05:00
Brad King 3f85a95978 Merge topic 'doc-add_test-config-genex' 
af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5636
 2020-12-22 09:11:32 -05:00
Brad King 60eaf95db0 Merge topic 'create_test_sourcelist-typo' 
0273293047 create_test_sourcelist: fix typo in placeholder name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5632
 2020-12-22 09:10:45 -05:00
Brad King 1b02278fb1 Merge topic 'FindOpenSSL-win-arch' 
a6e03b2e6f FindOpenSSL: Distinguish 32-bit and 64-bit search paths on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5630
 2020-12-22 09:09:49 -05:00
Brad King 89115682b5 Merge topic 'apple-missing-framework' 
9ab77201f7 Apple: Fix linking to frameworks that do not exist until build time

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5638
 2020-12-22 09:08:52 -05:00
Kitware Robot 814522ef4d CMake Nightly Date Stamp 2020-12-22 00:01:11 -05:00
Brad King 3af0671019 Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE 
The test requires a non-empty `CMAKE_BUILD_TYPE` to function on
single-config generators.  Force a non-empty configuration if the test
is configured explicitly with empty `-DCMAKE_BUILD_TYPE=`.
 2020-12-21 21:27:35 -05:00
Craig Scott 51595e5f01 FetchContent: Relative SOURCE_DIR override cannot be a hard error 
Fixes: #21624
 2020-12-22 11:09:18 +11:00
NeroBurner af7882ba6e Help: replace deprecated $<CONFIGURATION> generator expression 
The `$<CONFIGURATION>` genex has been deprecated since CMake 3.0.
Use `$<CONFIG>` instead in the `add_test` example.
 2020-12-21 13:54:25 -05:00
Sergey Bronnikov 0273293047 create_test_sourcelist: fix typo in placeholder name 
Rename `CMAKE_FUNCTION_TABLE_{ENTIRES => ENTRIES}`.
 2020-12-21 13:45:12 -05:00
Ma Br a6e03b2e6f FindOpenSSL: Distinguish 32-bit and 64-bit search paths on Windows 
Fixes: #21611
 2020-12-21 13:34:42 -05:00
Brad King 9ab77201f7 Apple: Fix linking to frameworks that do not exist until build time 
Fixes: #21621
 2020-12-21 11:50:54 -05:00
Brad King 05a59f37ab Merge topic 'ctest-test-dir' 
dbcf86d24d Ctest: Support build tree on command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5623
 2020-12-21 10:04:58 -05:00
Brad King f5e9aedb5a Merge topic 'make-CMAKE_EXECUTABLE_FORMAT-internal' 
cc8162a981 CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNAL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !5627
 2020-12-21 10:02:56 -05:00
Brad King 81809d1485 Merge topic 'revert-write-through' into release-3.19 
92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5628
 2020-12-21 10:00:18 -05:00
Brad King 3dec2d1a77 Merge branch 'release-3.19' 2020-12-21 10:00:18 -05:00
Brad King bb87f40b55 Merge topic 'revert-write-through' 
92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5628
 2020-12-21 10:00:18 -05:00
Asit Dhal c3385dd8bd file(GENERATE): Support options to manipulate file permissions 
Fixes: #15653
 2020-12-21 12:16:16 +01:00
Craig Scott 4a6074821e Merge topic 'doc-fix-XCODE_LINK_BUILD_PHASE_MODE' into release-3.19 
2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5634
 2020-12-21 06:03:38 -05:00
Craig Scott 6e4e444d82 Merge branch 'release-3.19' 2020-12-21 06:03:38 -05:00
Craig Scott 63ff43fc9e Merge topic 'doc-fix-XCODE_LINK_BUILD_PHASE_MODE' 
2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5634
 2020-12-21 06:03:38 -05:00
Kitware Robot c89514a6a4 CMake Nightly Date Stamp 2020-12-21 00:01:12 -05:00
Craig Scott 2d84b9d145 Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE 2020-12-20 20:13:23 +11:00
Kitware Robot bc78c212b7 CMake Nightly Date Stamp 2020-12-20 00:01:05 -05:00
Asit Dhal b68699b717 target_include_directories: Support AFTER option 
Fixes: #20134
 2020-12-19 14:51:39 +01:00
Kitware Robot d231f429f1 CMake Nightly Date Stamp 2020-12-19 00:01:18 -05:00
Kitware Robot 7280efeeeb CMake Nightly Date Stamp 2020-12-18 00:01:10 -05:00
Brad King 6d7621baea Merge topic 'qt-autogen-per-config' 
20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific
92d7b456e5 Autogen: Add support for per-config sources
3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5624
 2020-12-17 13:22:40 -05:00
Daan De Meyer 850de767e9 ExternalProject: Silence step succeeded message when using Ninja 
When doing an ExternalProject superbuild with all output logged to
files, the output currently looks as follows:

```
[652/904] Performing install step for 'plasma-framework'
-- plasma-framework install command succeeded.  See also /root/build/kde/frameworks/plasma-framework/log/plasma-framework-install-*.log
[658/904] Performing build step for 'khtml'
-- khtml build command succeeded.  See also /root/build/kde/frameworks/khtml/log/khtml-build-*.log
[659/904] Performing install step for 'khtml'
-- khtml install command succeeded.  See also /root/build/kde/frameworks/khtml/log/khtml-install-*.log
[661/904] Performing configure step for 'krunner'
-- krunner configure command succeeded.  See also /root/build/kde/frameworks/krunner/log/krunner-configure-*.log
[661/904] Performing build step for 'krunner'
```

More specifically, because a success line is printed for every
succeeded step, we lose the advantage of Ninja's progress bar
which will now also print a new line instead of updating the same
link as happens when using Ninja in a normal CMake project.

By silencing the success message when using the Ninja generator,
Ninja's progress bar works as expected and updates inline instead
of printing a new line for each progress update.

With this change, the above output is reduced to a single line
progress bar:

```
[661/904] Performing build step for 'krunner'
```
 2020-12-17 17:32:57 +00:00
Brad King 215bd0e72b Merge topic 'emacs-extend-cmake-mode' 
591d4bbdaf cmake-mode.el: Require the rx package
901386f646 cmake-mode.el: Add navigation by function and macro

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5605
 2020-12-17 09:10:41 -05:00
Brad King 92021198e5 cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows 
Revert commit d78c22aa64 (cmSystemTools: Improve RenameFile on Windows
with MOVEFILE_WRITE_THROUGH, 2020-08-25, v3.19.0-rc1~243^2~3).  Using
this flag causes the operation to fail frequently in some environments.
Drop it for now pending further investigation.

Fixes: #21571
 2020-12-17 08:35:38 -05:00
Craig Scott cc8162a981 CMakeDetermineCompilerId: Ensure CMAKE_EXECUTABLE_FORMAT is INTERNAL 
Fixes: #21607
 2020-12-17 21:09:46 +11:00
Kitware Robot cf2486fada CMake Nightly Date Stamp 2020-12-17 00:01:08 -05:00
Asit Dhal dbcf86d24d Ctest: Support build tree on command line 
Fixes: #21268
 2020-12-17 05:01:03 +01:00
Brad King 20e4db4a66 cmGeneratorTarget: Make GetConfigCommonSourceFiles Xcode-specific 
The Xcode generator is the only place left that we do not support
per-config sources.  Make the corresponding helper Xcode-specific to
avoid any other new uses.
 2020-12-16 14:04:30 -05:00
Brad King 92d7b456e5 Autogen: Add support for per-config sources 
Fixes: #20682
 2020-12-16 14:04:30 -05:00
Brad King 3ffebbaefb Tests/QtAutogen: Forward build configuration in multi-config generators 2020-12-16 10:09:09 -05:00
Brad King 0f61fac6f0 Merge branch 'release-3.19' 2020-12-16 08:26:00 -05:00
Craig Scott d2456b29f4 Merge topic 'unity-anon-ns' 
0fe9c40494 Unity Build: Add option for generating per-file unique id

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4784
 2020-12-16 07:40:41 -05:00