mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-26 18:58:34 -06:00
Code Issues Packages Projects Releases Wiki Activity
54,450 Commits 2 Branches 391 Tags
c8991f17cf5bb07fc1b0d7fa68e9613fa8617900
Commit Graph

54450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
c8991f17cf Merge topic 'cmake-packages-pkg-cfg-file-example' 
d186797cf6 Help: Fix regex in example of cmake-packages(7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6489
 2021-09-02 10:26:21 -04:00
Brad King
bd7003b858 Merge topic 'test-install-symlinks' 
047d46ebdb Fix: InstallMode tests fail on some platforms
f64e8036aa Tests: Fix check to add InstallMode tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6473
 2021-09-02 10:23:35 -04:00
Brad King
04a05e75ea Merge topic 'update-libarchive' 
6287b02147 libarchive: Limit xz compression level to 6 on AIX
651ecdddfa Utilities: Add hard-coded try_compile result for libarchive strnlen check
107df8e650 Merge branch 'upstream-LibArchive' into update-libarchive
dadea0e5ce LibArchive 2020-12-26 (227a4b97)
3d05964b02 libarchive: Update script to get 3.5.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6464
 2021-09-02 10:22:44 -04:00
Marc Chevrier
80e0245e0e Merge topic 'enh-SetProperty-accepts-new-types' 
dc3aa4024e Refactor: Use new SetProperty signatures
6dfa581bab Enhancement: SetProperty accept cmProp or std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6478
 2021-09-02 03:42:31 -04:00
Kitware Robot
3078bf2063 CMake Nightly Date Stamp 2021-09-02 00:01:09 -04:00
Kitware Robot
2458541fb6 CMake Nightly Date Stamp 2021-09-01 00:01:12 -04:00
Kitware Robot
f94e4b8bb3 CMake Nightly Date Stamp 2021-08-31 00:01:10 -04:00
Kitware Robot
f3294e6523 CMake Nightly Date Stamp 2021-08-30 00:01:36 -04:00
Craig Scott
122ae3189e Merge topic 'command-if-matches' 
c6a6c008f4 Help: Fix terminology for regular expression in if(MATCHES)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6487
 2021-08-29 07:47:50 -04:00
Kitware Robot
c9292f56fc CMake Nightly Date Stamp 2021-08-29 00:01:09 -04:00
Johel Ernesto Guerrero Peña
d186797cf6 Help: Fix regex in example of cmake-packages(7) 
This change makes it work as intended as opposed to make the condition always true.
This can be confirmed by running the following script:
```
[johel@sundown tmp]$ cat x.cmake 
function(f)
  set(valid_inputs abc 123)
  foreach(input ${ARGV})
    if(";${valid_inputs};" MATCHES input)
      message("old valid: ${input}")
    endif()
    if(";${valid_inputs};" MATCHES ";${input};")
      message("new valid: ${input}")
    endif()
  endforeach()
endfunction()

f("0;z;123;12;abc;ab;13;ac")

set(_supported_components Plot Table)
set(ClimbingStats_FIND_COMPONENTS Plot Table P T)

foreach(_comp ${ClimbingStats_FIND_COMPONENTS})
  if(NOT ";${_supported_components};" MATCHES _comp)
    message("old invalid: set(ClimbingStats_NOT_FOUND_MESSAGE \"Unsupported component: ${_comp}\")")
  endif()
  if(NOT ";${_supported_components};" MATCHES ";${_comp};")
    message("new invalid: set(ClimbingStats_NOT_FOUND_MESSAGE \"Unsupported component: ${_comp}\")")
  endif()
endforeach()
[johel@sundown tmp]$ cmake -P x.cmake 
new valid: 123
new valid: abc
old invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: Plot")
old invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: Table")
old invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: P")
new invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: P")
old invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: T")
new invalid: set(ClimbingStats_NOT_FOUND_MESSAGE "Unsupported component: T")
```
 2021-08-28 10:49:28 -04:00
Kitware Robot
9c8e25c5fd CMake Nightly Date Stamp 2021-08-28 00:01:10 -04:00
Johel Ernesto Guerrero Peña
c6a6c008f4 Help: Fix terminology for regular expression in if(MATCHES) 
This was wrongly changed in commit ba90611225 (Help: Make synopsis of
if command more compact; add section headers, 2018-10-05).
 2021-08-28 13:58:25 +10:00
Kitware Robot
33d4ec1282 CMake Nightly Date Stamp 2021-08-27 00:01:10 -04:00
Kitware Robot
aedfe6c923 CMake Nightly Date Stamp 2021-08-26 00:01:13 -04:00
Brad King
e0a34750f8 Merge branch 'release-3.21' 2021-08-25 11:29:47 -04:00
Brad King
31c5700d43 CMake 3.21.2 v3.21.2 2021-08-25 10:17:05 -04:00
Brad King
9498a0fbc7 Merge branch 'release-3.21' 2021-08-25 09:59:47 -04:00
Brad King
bd8a6e8abe Merge topic 'vs2022' 
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
 2021-08-25 09:59:47 -04:00
Brad King
af71bdb601 Merge topic 'vs2022' into release-3.21 
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6480
 2021-08-25 09:59:46 -04:00
Brad King
c8ec137da7 VS: Update Visual Studio 17 2022 generator for Preview 3.1 
Issue: #22339
 2021-08-25 09:47:30 -04:00
Brad King
b0a24db270 Merge topic 'find-package-note' 
d7e521bcd3 Help: find_package: Tweak change description

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6477
 2021-08-25 09:19:04 -04:00
Brad King
67d0d8b9d5 Merge topic 'darwin-wmake-jwasm-support' 
bf09145eb0 Enable Watcom WMake generator on Darwin
78f758a463 Use dashes for MASM flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6472
 2021-08-25 09:18:11 -04:00
Brad King
e7fe4633b7 Merge branch 'release-3.21' 2021-08-25 09:14:25 -04:00
Brad King
e4302d8c8d Merge branch 'release-3.20' into release-3.21 2021-08-25 09:14:15 -04:00
Brad King
385d6e33b9 Merge branch 'release-3.20' 2021-08-25 09:14:03 -04:00
Brad King
8b750951aa Merge branch 'release-3.21' 2021-08-25 09:12:23 -04:00
Brad King
78eff650fa Merge topic 'GNUInstallDirs-variable-named-0' 
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6474
 2021-08-25 09:12:23 -04:00
Brad King
eae5533ab3 Merge topic 'GNUInstallDirs-variable-named-0' into release-3.21 
49a5dbcaff GNUInstallDirs: avoid unwanted variable dereference

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6474
 2021-08-25 09:12:22 -04:00
Marc Chevrier
dc3aa4024e Refactor: Use new SetProperty signatures 2021-08-25 10:09:10 +02:00
Marc Chevrier
6dfa581bab Enhancement: SetProperty accept cmProp or std::string 
Methods SetProperty of classes cmPropertyMap, cmStateDirectory
and cmMakefile accept now cmProp or std::string as argument.
 2021-08-25 10:09:02 +02:00
Kitware Robot
cb7edb1f4b CMake Nightly Date Stamp 2021-08-25 00:01:13 -04:00
Felix Lelchuk
047d46ebdb Fix: InstallMode tests fail on some platforms 
1) The ExternalProject_Add() command was called with
   UPDATE_COMMAND ";" which was not noticable on most platforms

2) On AIX/GCC, the executable did not link because symbols from
   imported libraries were assumed extern "C" (see commit 4fc47424)
 2021-08-24 19:21:40 +02:00
Brad King
6287b02147 libarchive: Limit xz compression level to 6 on AIX 
Since libarchive commit `aff9809c` (Enable compression level up to 9 for
xz, xar, 7zip, 2020-07-26, v3.5.0~19^2), libarchive fails to initialize
xz compression on AIX with error

    Internal error initializing compression library: Cannot allocate memory

Revert to the old limit of level 6 on AIX.

Issue: #22553
 2021-08-24 13:02:57 -04:00
Brad King
651ecdddfa Utilities: Add hard-coded try_compile result for libarchive strnlen check 
libarchive 3.5.1 checks for strnlen.  It is available on all Windows
platforms.
 2021-08-24 12:53:59 -04:00
Brad King
107df8e650 Merge branch 'upstream-LibArchive' into update-libarchive 
* upstream-LibArchive:
  LibArchive 2020-12-26 (227a4b97)
 2021-08-24 10:13:10 -04:00
LibArchive Upstream
dadea0e5ce LibArchive 2020-12-26 (227a4b97) 
Code extracted from:

    https://github.com/libarchive/libarchive.git

at commit 227a4b9719a7fbeba6ba46e377ff7d953f405cd5 (v3.5.1).
 2021-08-24 10:10:54 -04:00
Brad King
3d05964b02 libarchive: Update script to get 3.5.1 2021-08-24 10:09:59 -04:00
Brad King
71bf838cf3 Merge topic 'refactor-reduce-cmToCStr-usage' 
5a2a275bb4 Refactor: reduce cmToCStr usage
2984df9100 Refactor: cmHasPrefix and cmHasSuffix accept now cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6455
 2021-08-24 10:05:00 -04:00
Brad King
cf90aa5595 Merge topic 'host-distro-info' 
b9698f89df cmake_host_system_information: Make it available for all systems
5469c71a82 Refactor: Simplify `GetValue()` function calls
6c92f80f2e cmake_host_system_information: Also set `USED_FALLBACK_SCRIPT`
efe139d1b8 cmake_host_system_information: Can run fallback scripts
1e65e4a6e5 cmake_host_system_information: Can read `/etc/os-release` file
e808cbb1dd Testing: Convert `cmake_host_system_information` tests into `RunCMake`
9e831284e5 Documentation: Use definition list instead of tables
346f3de005 Refactor: Deduplicate code for `VS_nn_DIR` keys processing
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !6410
 2021-08-24 10:04:15 -04:00
Brad King
fd64b84d15 Merge branch 'GNUInstallDirs-variable-named-0' into release-3.20 
Merge-request: !6474
 2021-08-24 10:02:58 -04:00
Brad King
91d5bf68ae Merge branch 'release-3.21' 2021-08-24 09:58:09 -04:00
Brad King
e9003cbcfe Merge topic 'vs-toolset-version' 
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
 2021-08-24 09:58:09 -04:00
Brad King
5a4847a0a4 Merge topic 'vs-toolset-version' into release-3.21 
25c5ebba7e VS: Add special case for '-T version=14.29.16.11' under VS 16.11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !6469
 2021-08-24 09:58:08 -04:00
Brad King
2a4d1c8048 Merge branch 'release-3.21' 2021-08-24 09:57:10 -04:00
Brad King
ac0f76a748 Merge topic 'revert-autouic-header-depends' 
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6465
 2021-08-24 09:57:09 -04:00
Brad King
b2e2f5c196 Merge topic 'revert-autouic-header-depends' into release-3.21 
d2a6e160aa AUTOUIC: Revert "Fix generating of dependency rules for UI header files"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !6465
 2021-08-24 09:57:08 -04:00
Brad King
fff26cd8dc Merge branch 'release-3.21' 2021-08-24 09:54:58 -04:00
Brad King
38dbf18bb1 Merge topic 'FindMPI-framework-not-a-compile-flag' 
2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6467
 2021-08-24 09:54:58 -04:00
Brad King
1dd9c96427 Merge topic 'FindMPI-framework-not-a-compile-flag' into release-3.21 
2b2a6a7170 FindMPI: do not detect `-framework` as a compile flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Utkarsh Ayachit <utkarsh.ayachit@kitware.com>
Merge-request: !6467
 2021-08-24 09:54:57 -04:00