Commit Graph

52235 Commits

Author SHA1 Message Date
Brad King
00ecddd9eb Tests: Enable Framework test case with spaces everywhere possible 2021-03-10 10:04:05 -05:00
Brad King
b6cc9be009 Merge branch 'backport-xcode-framework-quoting' into xcode-framework-quoting 2021-03-10 10:03:36 -05:00
Brad King
4f9a71974e Xcode: Restore support for spaces in framework names
In commit ce2dee9e5b (Xcode: Don't add framework as -framework argument
in linker info list, 2020-09-28, v3.19.0-rc1~47^2) we split up the path
to a framework into the directory and framework name parts, but only
retained the quoting on the directory part.  Restore quoting of the
framework name.

Fixes: #21910
2021-03-10 10:01:11 -05:00
Kitware Robot
bef1cc77ef CMake Nightly Date Stamp 2021-03-10 00:01:13 -05:00
Brad King
b5f60c54d0 Merge topic 'update-kwsys'
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys
9e556829c8 KWSys 2021-03-08 (5bfba5e1)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5890
2021-03-09 09:18:20 -05:00
Brad King
d03732bc65 Merge topic 'soname-spaces'
7621861f30 Tests: Update LibName to cover spaces in shared library name
388eb83c09 Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generators
c0a3317497 Ninja: Escape SONAME on linker command line
9dfa7981d5 Makefiles: Escape SONAME on linker command line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5880
2021-03-09 09:17:43 -05:00
Brad King
a62a30d06b Merge branch 'release-3.20' 2021-03-09 09:16:28 -05:00
Brad King
791338359f Merge branch 'release-3.19' into release-3.20 2021-03-09 09:16:21 -05:00
Brad King
e6815336f0 Merge branch 'release-3.20' 2021-03-09 09:15:43 -05:00
Brad King
22909e0def Merge topic 'CrayPrgEnv-detection' into release-3.20
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5889
2021-03-09 09:15:43 -05:00
Brad King
2843a322c8 Merge topic 'CrayPrgEnv-detection'
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5889
2021-03-09 09:15:43 -05:00
Kitware Robot
a8954cc3c4 CMake Nightly Date Stamp 2021-03-09 00:01:16 -05:00
Brad King
4d86c907f3 Merge branch 'upstream-KWSys' into update-kwsys
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2021-03-08 (5bfba5e1)
2021-03-08 13:32:35 -05:00
KWSys Upstream
9e556829c8 KWSys 2021-03-08 (5bfba5e1)
Code extracted from:

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

at commit 5bfba5e1a988e16df833e86062d61f4b70d83645 (master).

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

Ben Boeckel (4):
      f69c5cb7 Directory: return a bool literal on Windows
      2a118b34 SystemTools: use nullptr in Windows-only code
      7ee0dbee Directory: capture the error message
      dd703ac6 SystemTools: make file copying mechanisms public

Sean McBride (1):
      3ba8a6de Glob: Change deleted ctor and operator= from private to public
2021-03-08 13:32:35 -05:00
Brad King
1982264c17 Merge topic 'ExternalData-windows'
31be23dd1d ci: Restore the Module.ExternalData test on Windows
fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !5883
2021-03-08 13:18:24 -05:00
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
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
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
7621861f30 Tests: Update LibName to cover spaces in shared library name 2021-03-08 13:03:21 -05:00
Brad King
388eb83c09 Tests: Enable MAKE_SUPPORTS_SPACES tests with Ninja generators 2021-03-08 13:03:21 -05:00
Brad King
214a06ec2e Merge branch 'CrayPrgEnv-detection' into release-3.19
Merge-request: !5889
2021-03-08 12:36:00 -05:00
Brad King
23b101de60 Revert "Cray: Fix Cray compiler detection on new platforms"
The justification in commit 9ee4a42813 (Cray: Fix Cray compiler
detection on new platforms, 2020-12-01, v3.19.2~26^2) confuses detection
of the CrayPrgEnv with identification of the Cray compiler.  The
change regressed detection of the CrayPrgEnv on non-Cray compilers.
Revert it pending further investigation into the original problem.

Fixes: #21894
2021-03-08 12:28:36 -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
Brad King
31be23dd1d ci: Restore the Module.ExternalData test on Windows
In commit a58e3c7e8b (ci: Skip the Module.ExternalData test on Windows,
2020-10-01, v3.19.0-rc1~59^2) the test was dropped pending further
investigation.  We've now (hopefully) resolved the underlying problem,
so we can restore the test.
2021-03-05 10:59:20 -05:00
Brad King
fdfbf89f0c ExternalData: Avoid replacing a concurrently-created object
If more than one content link references the same object, the build
system may launch multiple download processes for the same object
concurrently.  Use whichever one finishes first, and discard the others.

Without this, we replace the objects and use the last finisher instead
of the first.  This is okay on non-Windows platforms where `rename(2)`
gives reliable atomic replacement.  However, on Windows platforms and
NTFS this is less reliable.  I've observed `MoveFileEx` somehow cause
another process to get `ERROR_SHARING_VIOLATION` when attempting to read
the destination file.  We may be able to improve the `file(RENAME)`
implementation on modern Windows 10 versions, but for ExternalData's use
case it is simpler to just not replace existing objects.
2021-03-05 10:58:07 -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
Alexander Stein
c0a3317497 Ninja: Escape SONAME on linker command line
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.

This was already done for soname symlink creation in commit 13c92b4a30
(Ninja: Fix creation of library symlinks in folders with spaces,
2019-05-20, v3.15.0-rc1~87^2).

Fixes: #20331
2021-03-04 15:44:49 -05:00
Alexander Stein
9dfa7981d5 Makefiles: Escape SONAME on linker command line
If the shared object name contains spaces, they need to be properly
escaped, or link command will fail.
2021-03-04 15:44:48 -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