mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-08 06:40:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
51,265 Commits 2 Branches 385 Tags
ef5b3eff4ece9628ffd7d752ae12aae9d5c9027e
Commit Graph

51265 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott
ef5b3eff4e Merge topic 'xcode-inherit-paths' 
5115e8b2b6 Xcode: Generalize inheritance of project-level search paths
6b6230b23b cmGlobalXCodeGenerator: Factor out helper to append attribute

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5637
 2020-12-23 19:11:21 -05:00
Brad King
95c59252c4 Merge topic 'FindGTK2-atkmmconfig' 
9e5e312210 FindGTK2: Find atkmmconfig.h separately from atkmm.h

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5645
 2020-12-23 09:43:57 -05:00
Brad King
809e80ed7c Merge topic 'cpack-nuget-linux' 
dade75509f CPack/NuGet: Fix nuspec file generation for UNIX-style OS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5640
 2020-12-23 09:39:40 -05:00
Brad King
6f7d7e4dbf Merge topic 'editorconfig' 
8c14c6bd0b Add .editorconfig file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev>
Merge-request: !5629
 2020-12-23 09:37:57 -05:00
Brad King
91003e99e7 Merge branch 'release-3.19' 2020-12-23 09:35:40 -05:00
Brad King
2fcf38b846 Merge topic 'rel-linux-aarch64' 
7cf6941f37 Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64
fe1bd15ad7 gitlab-ci: add jobs to make Linux release packages for aarch64
24247155af Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64
2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary
76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch
e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries
595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bruno Verachten <gounthar@gmail.com>
Merge-request: !5538
 2020-12-23 09:35:40 -05:00
Brad King
511158a03b Merge topic 'rel-linux-aarch64' into release-3.19 
2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary
76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch
e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries
595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Bruno Verachten <gounthar@gmail.com>
Merge-request: !5538
 2020-12-23 09:35:39 -05:00
Kitware Robot
8c9c338e5e CMake Nightly Date Stamp 2020-12-23 00:01:11 -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
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
Brad King
7cf6941f37 Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 2020-12-22 14:05:43 -05:00
Hi Key
fe1bd15ad7 gitlab-ci: add jobs to make Linux release packages for aarch64 2020-12-22 14:05:17 -05:00
Brad King
24247155af Merge branch 'backport-rel-linux-aarch64' into rel-linux-aarch64 2020-12-22 14:04:59 -05:00
Brad King
2c1127a7a9 Help: Add 3.19.3 release note for Linux aarch64 binary 2020-12-22 14:04:39 -05:00
Hi Key
e14fb01c41 Utilities/Release: Add docker specs for Linux aarch64 binaries 
Base them on the existing `x86_64` specs.  Update the centos
base image from centos 6 to centos 7 to get aarch64 support.
The resulting binaries require GLIBC 2.17.

Fixes: #17923
 2020-12-22 14:04:39 -05:00
Hi Key
76742c4cbe gitlab-ci: add jobs to make Linux release packages for aarch64 on 3.19 branch 2020-12-22 14:04:39 -05:00
Brad King
595551a805 gitlab-ci: consolidate Linux release package job spec for x86_64 2020-12-22 14:04:39 -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
7340fd823f Merge branch 'release-3.19' 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
Jani Välimaa
9e5e312210 FindGTK2: Find atkmmconfig.h separately from atkmm.h 
The former may be installed into libdir instead of includedir.
We already do this for several other components.

Fixes: #21627
 2020-12-22 13:43:34 -05:00
iorikyu
dade75509f CPack/NuGet: Fix nuspec file generation for UNIX-style OS 
Use forward slashes, which should work on both UNIX and Windows.
 2020-12-22 09:30:33 -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
Brad King
5115e8b2b6 Xcode: Generalize inheritance of project-level search paths 
Generalize the change from commit bffb17be3d (Xcode: Inherit target
library and framework search paths from project, 2020-11-04,
v3.19.0-rc3~4^2) to apply to framework and other kinds of search paths
added either for include directories or for linking.

Issue: #21617
 2020-12-22 08:56:26 -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
Daan De Meyer
8c14c6bd0b Add .editorconfig file 
A .editorconfig file allows many editors (e.g. Visual Studio Code)
to autoconfigure themselves based on its contents. This avoids
some formatting issues in PRs because editors will do the right
thing by default with a .editorconfig file available in the repo.
 2020-12-21 21:13:58 +01: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
6b6230b23b cmGlobalXCodeGenerator: Factor out helper to append attribute 2020-12-21 10:19:45 -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