mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-06 14:19:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
52,212 Commits 2 Branches 401 Tags
b7cd44e48234ec02406fa057f6ee1850635acf60
Commit Graph

52212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King b7cd44e482 Merge topic 'vs-flag-table-refactor' 
1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface
414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name
cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries
d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization
99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments
1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments
a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name
e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5884
 2021-03-08 13:13:37 -05:00
Brad King c9f5b1e010 Merge topic 'clarify_find_searches_in_respect_to_env_variables' 
934861e354 Find: Document that first argument to PATHS and HINTS can be ENV{}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5886
 2021-03-08 13:11:27 -05:00
Brad King 52ee42310d Merge branch 'release-3.20' 2021-03-08 13:07:20 -05:00
Brad King 31fc010259 Merge topic 'cray-fortran' 
ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5882
 2021-03-08 13:07:20 -05:00
Brad King 155ec56c9f Merge topic 'cray-fortran' into release-3.20 
ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5882
 2021-03-08 13:07:20 -05:00
Kitware Robot ae791686e7 CMake Nightly Date Stamp 2021-03-08 00:03:15 -05:00
Kitware Robot b72c7f856d CMake Nightly Date Stamp 2021-03-07 00:01:08 -05:00
Kitware Robot 425ac4c3b3 CMake Nightly Date Stamp 2021-03-06 00:01:19 -05:00
Robert Maynard 934861e354 Find: Document that first argument to PATHS and HINTS can be ENV{} 2021-03-05 09:59:39 -05:00
Brad King 1b33150f7e cmGlobalVisualStudio10Generator: Generalize flag table lookup interface 2021-03-05 09:34:59 -05:00
Brad King 414b5e0119 cmGlobalVisualStudio10Generator: Clarify LoadFlagTable argument name 2021-03-05 09:34:59 -05:00
Brad King cbba9f26a8 cmGlobalVisualStudio10Generator: Drop unnecessary temporaries 2021-03-05 09:34:59 -05:00
Brad King d5522f096d cmGlobalVisualStudio10Generator: Drop default toolset name canonicalization 
The default toolset names are always canonical.
 2021-03-05 09:34:58 -05:00
Brad King 99f6f1b3b9 cmGlobalVisualStudio10Generator: Remove redundant arguments 2021-03-05 09:34:58 -05:00
Brad King 1b774e18fb cmGlobalVisualStudio10Generator: Remove redundant arguments 2021-03-05 09:34:58 -05:00
Brad King a1c0758ea0 cmGlobalVisualStudio10Generator: Clarify method name 2021-03-05 09:34:58 -05:00
Brad King e562e8987c cmGlobalVisualStudio10Generator: Remove unused flag table method argument 2021-03-05 09:34:58 -05:00
Brad King fe17685722 cmGlobalVisualStudio10Generator: Adopt flag table name methods 
Migrate them from `cmVisualStudio10ToolsetOptions`.
 2021-03-05 09:34:58 -05:00
Brad King 15610d42fe Merge topic 'file-RENAME' 
9bf40d8027 file(RENAME): Add option to not replace existing path
3600c6cd8c cmSystemTools: Add RenameFile option to not replace destination
c61292726c file(RENAME): Add option to capture error message on failure
0c2dc34504 cmSystemTools: Add RenameFile signature to capture the error message
adc351db8f Tests: Add RunCMake helper to run a plain script

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5877
 2021-03-05 08:27:18 -05:00
Brad King 412479b9d8 Merge topic 'cmake-gui-search-case' into release-3.20 
9ec50ff157 cmake-gui: Restore search bar case insensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5878
 2021-03-05 08:25:29 -05:00
Brad King 33f0985e39 Merge branch 'release-3.20' 2021-03-05 08:25:29 -05:00
Brad King 1b2db411ad Merge topic 'cmake-gui-search-case' 
9ec50ff157 cmake-gui: Restore search bar case insensitivity

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5878
 2021-03-05 08:25:29 -05:00
Brad King c1bbe44dad Merge topic 'cpack-source-dir-symlink' 
c456b09513 CPack: Fix symbolic link detection for directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5879
 2021-03-05 08:22:35 -05:00
Olivier Iffrig c456b09513 CPack: Fix symbolic link detection for directories 
In the case where the current path is a symlink to a directory, a
trailing slash causes the link to be dereferenced, which means that any
subsequent `FileIsSymlink` on it will return false.

Fixes: #21886
 2021-03-05 08:21:13 -05:00
Brad King ef513fe3d1 Cray: Enable explicit Fortran preprocessing for Ninja generator 
Cray 11.0 adds support for preprocessing with output written to a
specified file (instead of always next to the source).  Use it to
enable Cray Fortran with the Ninja generator.

Patch-by: James Elliott
Fixes: #20731
 2021-03-05 08:11:05 -05:00
Kitware Robot 96ee96c6d5 CMake Nightly Date Stamp 2021-03-05 00:01:17 -05:00
Brad King 5025b56843 Merge topic 'macos-arm64-rosetta' 
fd714dd2b8 Tests: Fix FindPackageModeMakefileTest with CMAKE_OSX_ARCHITECTURES
42edf53ce2 Tests: Generalize FindPackageModeMakefileTest extra flags var

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5876
 2021-03-04 12:33:37 -05:00
Brad King 9ec50ff157 cmake-gui: Restore search bar case insensitivity 
Since these changes:

* commit f1de6f6682 (cmake-gui: Support building against Qt6,
                     2020-12-17, v3.20.0-rc1~205^2~7)
* commit 134d69121e (cmake-gui: Restore search bar for cache view and
                     environment dialog, 2021-02-22, v3.20.0-rc2~12^2)

the search bar is no longer case insensitive when using Qt 5.12.[0-1],
and possibly some later versions.  It works as of Qt 5.15 though, so
update our version check accordingly.

Fixes: #21884
 2021-03-04 11:25:54 -05:00
Brad King 9bf40d8027 file(RENAME): Add option to not replace existing path 
Add a `NO_REPLACE` option that prevents overwriting `<newname>`
if it exists.
 2021-03-04 08:49:48 -05:00
Brad King 3600c6cd8c cmSystemTools: Add RenameFile option to not replace destination 2021-03-04 08:47:31 -05:00
Brad King c61292726c file(RENAME): Add option to capture error message on failure 2021-03-04 08:44:06 -05:00
Brad King 0c2dc34504 cmSystemTools: Add RenameFile signature to capture the error message 2021-03-04 08:26:21 -05:00
Kitware Robot 1dde7e350a CMake Nightly Date Stamp 2021-03-04 00:01:19 -05:00
Brad King adc351db8f Tests: Add RunCMake helper to run a plain script 
Many tests covering CMake scripting commands can work without
initializing a full generator.
 2021-03-03 16:41:30 -05:00
Brad King fd714dd2b8 Tests: Fix FindPackageModeMakefileTest with CMAKE_OSX_ARCHITECTURES 2021-03-03 10:29:53 -08:00
Brad King 42edf53ce2 Tests: Generalize FindPackageModeMakefileTest extra flags var 2021-03-03 10:29:35 -08:00
Brad King 7eb867b255 Merge branch 'release-3.20' 2021-03-03 12:35:11 -05:00
Brad King 12a139f2b6 CMake 3.20.0-rc3 v3.20.0-rc3 2021-03-03 11:43:22 -05:00
Brad King 2f3a3eb01f Merge branch 'release-3.20' 2021-03-03 11:11:58 -05:00
Brad King ef3d1ebda8 Merge topic 'android-r22' into release-3.20 
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
 2021-03-03 11:11:58 -05:00
Brad King 957a117c70 Merge topic 'android-r22' 
005e2cdfb0 Android: Do not use gold for ndk >= r22
ed7a87f270 Tests: Update RunCMake.Android for NDK r22
4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable
746906242d Android: Detect NDK version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5862
 2021-03-03 11:11:58 -05:00
Haibo Huang 005e2cdfb0 Android: Do not use gold for ndk >= r22 
Fixes: #21772
 2021-03-03 10:28:56 -05:00
Brad King ed7a87f270 Tests: Update RunCMake.Android for NDK r22 
Use `CMAKE_ANDROID_NDK_VERSION` to check for files expected based
on the version of the NDK.
 2021-03-03 10:27:50 -05:00
Brad King 4950d35733 Help: Document CMAKE_ANDROID_NDK_VERSION variable 2021-03-03 10:27:50 -05:00
Haibo Huang 746906242d Android: Detect NDK version number 
Report it in `CMAKE_ANDROID_NDK_VERSION`.
 2021-03-03 10:26:36 -05:00
Brad King a88efbc9cf Merge topic 'cpack-dmg-filesystem' 
e3ac388738 cpack: add CPACK_DMG_FILESYSTEM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5873
 2021-03-03 09:07:29 -05:00
Brad King 3aec26660a Merge topic 'nasm_add_deps' 
48e74ec1e6 ASM_NASM: generate depfiles for other makefiles
fcf16e9459 ASM_NASM: Add depfile generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5868
 2021-03-03 09:06:06 -05:00
Brad King 97944e01b0 Merge topic 'ci-nightly-ide-jobs' into release-3.20 
e5698605d7 gitlab-ci: ignore failing tests for external IDE testing
beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs
18d6737e96 gitlab-ci: always upload test and release artifacts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5871
 2021-03-03 09:04:31 -05:00
Brad King 2a902fec28 Merge branch 'release-3.20' 2021-03-03 09:04:31 -05:00
Brad King 594483728c Merge topic 'ci-nightly-ide-jobs' 
e5698605d7 gitlab-ci: ignore failing tests for external IDE testing
beb130c65d gitlab-ci: allow some jobs to ignore failing tests on nightly runs
18d6737e96 gitlab-ci: always upload test and release artifacts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5871
 2021-03-03 09:04:31 -05:00