mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-23 06:47:08 -05:00
Code Issues Packages Projects Releases Wiki Activity
47,522 Commits 2 Branches 401 Tags
e7f58eff27ded2dad51e5919b6669c6b35b7134f
Commit Graph

47522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King e7f58eff27 Merge topic 'cuda_check' 
e758331595 cm_cxx_features: Remove CUDA installation warning filtering

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4554
 2020-04-02 11:15:44 -04:00
Brad King 3667366171 Merge topic 'update-kwsys' 
afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys
976d29b9bd KWSys 2020-04-01 (25694819)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4556
 2020-04-02 11:14:46 -04:00
Brad King 11d43a7ed6 Merge branch 'release-3.16' 2020-04-02 11:13:40 -04:00
Brad King 8386407e07 Merge branch 'release-3.17' 2020-04-02 11:12:54 -04:00
Brad King 35d9ca268b Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Brad King d26f15dfce Merge topic 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.17 
81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4557
 2020-04-02 11:12:54 -04:00
Kitware Robot af138785e2 CMake Nightly Date Stamp 2020-04-02 00:01:11 -04:00
Brad King cfc92b483f Merge topic 'aux-install-dest' 
2642f432ef Aux: Install editor and bash files to more natural locations

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4548
 2020-04-01 10:54:44 -04:00
Brad King f9be12707f Merge topic 'relax_compiler_prefix_detection' 
c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4547
 2020-04-01 10:53:46 -04:00
Brad King 221b046ad3 Merge topic 'cmprop-target' 
3eec21a01c cmTarget::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4546
 2020-04-01 10:52:39 -04:00
Brad King 88507b1d51 Merge branch 'release-3.17' 2020-04-01 10:43:25 -04:00
Brad King 4e69c9d8d8 Merge topic 'cpack-nsis-version' 
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
 2020-04-01 10:43:25 -04:00
Brad King d68794a707 Merge topic 'cpack-nsis-version' into release-3.17 
aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4552
 2020-04-01 10:43:24 -04:00
Brad King 095cc2dc8d Merge branch 'release-3.17' 2020-04-01 10:42:19 -04:00
Brad King 85f87c9d40 Merge topic 'xl-cxx14' 
46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support
4aaa9ea96c XL: C++14 language level flags are only available on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4551
 2020-04-01 10:42:19 -04:00
Brad King 9b32801859 Merge topic 'xl-cxx14' into release-3.17 
46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support
4aaa9ea96c XL: C++14 language level flags are only available on Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4551
 2020-04-01 10:42:18 -04:00
Brad King 3f1cd55180 Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16 
Merge-request: !4557
 2020-04-01 10:38:31 -04:00
Marc Chevrier 81beb28752 FindPython: fix handling when FIND_VIRTUALENV == FIRST 
Fixes: #20525
 2020-04-01 10:36:46 -04:00
Brad King afe8a5eb3f Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-04-01 (25694819)
 2020-04-01 10:15:00 -04:00
KWSys Upstream 976d29b9bd KWSys 2020-04-01 (25694819) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 256948196860967904712e0c8b242057d8ea3380 (master).

Upstream Shortlog
-----------------

Robert Maynard (1):
      4b537c59 Tests: Handle that root users on linux can always write to files
 2020-04-01 10:14:59 -04:00
Raul Tambre e758331595 cm_cxx_features: Remove CUDA installation warning filtering 
This has been fixed in upstream LLVM. No released version contains this issue.
https://github.com/llvm/llvm-project/commit/d32170dbd5b0d54436537b6b75beaf44324e0c28
https://github.com/llvm/llvm-project/commit/eb2ba2ea953b5ea73cdbb598f77470bde1c6a011
 2020-04-01 10:34:35 +03:00
Kitware Robot f30526c04a CMake Nightly Date Stamp 2020-04-01 00:01:10 -04:00
Brad King 7c6a0253f3 Merge branch 'release-3.17' 2020-03-31 12:43:42 -04:00
Brad King 8a0d0cbddd Merge topic 'docs_macho_prop_tgt' into release-3.17 
01b47293ea Help: Fix inaccuracies and omissions in MACHO_* property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Isuru Fernando <isuruf@gmail.com>
Merge-request: !4542
 2020-03-31 12:43:41 -04:00
Brad King 7d3bef7b7c Merge topic 'docs_macho_prop_tgt' 
01b47293ea Help: Fix inaccuracies and omissions in MACHO_* property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Isuru Fernando <isuruf@gmail.com>
Merge-request: !4542
 2020-03-31 12:43:41 -04:00
Eli Schwartz 2642f432ef Aux: Install editor and bash files to more natural locations 
The vim, emacs, and bash support files are not internal CMake resources
and so do not belong under `CMAKE_DATA_DIR`.  Move them over to proper
places under the `CMAKE_XDGDATA_DIR` as we do already for cmake-gui
desktop files and `cmake.m4`.

Fixes: #20522
 2020-03-31 12:01:40 -04:00
Brad King aa78a2537c CPack/NSIS: Document and check requirement of at least NSIS 3.0 
Since commit 9d2816544e (CPack/NSIS: Also preload the "UserInfo.dll"
plugin, 2020-01-04, v3.17.0-rc1~204^2) we require NSIS 3.0.  Since
older versions do not support Windows 8 or above, we can now require
at least version 3.0.

Fixes: #20514
 2020-03-31 10:57:28 -04:00
Brad King 46d9006efa XL: Add comment clarifying why we pretend it has full C++11/14 support 
Since commit b0f46c48f6 (CompileFeatures: Now able to presume full
language level support, 2019-03-06, v3.15.0-rc1~265^2~1) we pretend that
the XL compiler has full C++11 and C++14 support so that projects
specifying granular features will at least get the corresponding
compiler mode.  This is a work around for our lack of a full feature
check table for this compiler that works in common cases.  Add a comment
explaining this.

Issue: #20521
 2020-03-31 10:35:56 -04:00
Brad King 4aaa9ea96c XL: C++14 language level flags are only available on Linux 
Since commit 458ea9d76c (XL: Add C++14 language level flags, 2019-04-15,
v3.15.0-rc1~226^2) we use `-qlanglvl=extended1y` for C++14 with XL 16.1.
However, that flag is only supported on a Linux host.

Issue: #20521
 2020-03-31 10:35:56 -04:00
Brad King 529d7291b4 Merge topic 'GoogleTest-DISCOVERY_MODE-note' 
398a2bddf3 Help: Add release note for GoogleTest module DISCOVERY_MODE feature
2361f4efe1 Help: Update GoogleTest XML_OUTPUT_DIR release note markup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4550
 2020-03-31 09:25:09 -04:00
Brad King 0f66cb6b22 Merge topic 'FindBoost-lib-prefix-override' 
ff71612d02 FindBoost: Allow Boost_LIB_PREFIX to be set externally

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4531
 2020-03-31 09:23:13 -04:00
Brad King 1fa4baf628 Merge branch 'release-3.16' 2020-03-31 09:20:17 -04:00
Brad King 8c78028982 Merge branch 'release-3.17' 2020-03-31 09:19:43 -04:00
Brad King 69c8bf6967 Merge topic 'link-libs-config-case' into release-3.17 
2af18704fd Merge branch 'backport-3.16-link-libs-config-case'
3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex
5a95b5e091 target_link_libraries: Fix regression in case of $<CONFIG> genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4544
 2020-03-31 09:19:42 -04:00
Brad King 16053df54e Merge topic 'link-libs-config-case' 
2af18704fd Merge branch 'backport-3.16-link-libs-config-case'
3f976bf201 target_link_libraries: Fix regression in case of $<CONFIG> genex
5a95b5e091 target_link_libraries: Fix regression in case of $<CONFIG> genex

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4544
 2020-03-31 09:19:42 -04:00
Brad King 34108b496b Merge branch 'release-3.17' 2020-03-31 09:17:54 -04:00
Brad King 76f08a107b Merge topic 'aix-ExportImportList-install' into release-3.17 
39e5a4da22 AIX: Install ExportImportList script with execute permission

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4545
 2020-03-31 09:17:53 -04:00
Brad King 20819b1cdb Merge topic 'aix-ExportImportList-install' 
39e5a4da22 AIX: Install ExportImportList script with execute permission

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4545
 2020-03-31 09:17:53 -04:00
Brad King 398a2bddf3 Help: Add release note for GoogleTest module DISCOVERY_MODE feature 
This feature was added by commit 75e82a13db (GoogleTest: Add new
DISCOVERY_MODE option to gtest_discover_tests, 2020-03-16) but a
release note was accidentally left out.  Add one now.
 2020-03-31 07:18:14 -04:00
Brad King 2361f4efe1 Help: Update GoogleTest XML_OUTPUT_DIR release note markup 2020-03-31 07:17:54 -04:00
Craig Scott 01b47293ea Help: Fix inaccuracies and omissions in MACHO_* property docs 
The VERSION and SOVERSION properties are not true fallbacks for
the MACHO_* properties since the MACHO_* properties only affect
the embedded version information, but VERSION and SOVERSION
also affect other things.
 2020-03-31 20:08:29 +11:00
Kitware Robot be154ea1e3 CMake Nightly Date Stamp 2020-03-31 00:01:10 -04:00
Robert Maynard c5dd2ca538 DetermineCompiler: Relax _CMAKE_TOOLCHAIN_PREFIX detection 
Now detect _CMAKE_TOOLCHAIN_PREFIX whenever a compilers
name matches the heuristics, instead of only doing it
when cross compiling
 2020-03-30 17:08:01 -04:00
Vitaly Stakhovsky 3eec21a01c cmTarget::GetProperty: return cmProp 2020-03-30 15:00:14 -04:00
Brad King 888b8a43d8 Merge topic 'cmprop-state' 
a4255ecf81 cmStateDirectory::GetProperty: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4536
 2020-03-30 13:30:48 -04:00
Brad King 615950dfb6 Merge topic 'cuda_support_bin_util_overrides' 
79b6e928c3 CUDA: Support compiler specific FindBinUtils overrides

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Axel Huebl <axel.huebl@plasma.ninja>
Merge-request: !4539
 2020-03-30 13:29:36 -04:00
Brad King ad22d0c1d0 Merge topic 'vs-non-built-file-item-metadata' 
0723e04f7a VS: Add documentation for VS_SETTINGS and VS_SOURCE_SETTINGS_<tool>.
2ca1102f83 VS: Test VS_SETTINGS and VS_SOURCE_SETTINGS_<tool> properties.
f00e1b816d VS: Add VS_SOURCE_SETTINGS_<tool> target property
2ce42f281f VS: Add VS_SETTINGS source file property
53116d3942 VS: Use unordered_map to write HLSL settings.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4498
 2020-03-30 13:28:19 -04:00
Brad King cfa3a2342f Merge topic 'gtest_discover_tests_cross_compile_support' 
3b4838b57f GoogleTest: Add tests for MultiConfig discovery in PRE_TEST mode
1ba4cb565e GoogleTest: Parameterize tests to check PRE_TEST/POST_BUILD discovery mode
75e82a13db GoogleTest: Add new DISCOVERY_MODE option to gtest_discover_tests
889a7146ff GoogleTestAddTests: Refactor into callable method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4078
 2020-03-30 13:26:49 -04:00
Brad King e20146b429 Merge topic 'FindBoost-lib-prefix-clarify' 
040f503d83 FindBoost: Clarify logic selecting Boost_LIB_PREFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4537
 2020-03-30 13:24:38 -04:00
Brad King 026083f97b Merge branch 'release-3.17' 2020-03-30 13:23:19 -04:00