CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2021-01-12T10:20:31-05:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/5687cmMakefile: Don't expand bracket arguments in --trace-expand2021-01-12T10:20:31-05:00Raul Tambreraul@tambre.eecmMakefile: Don't expand bracket arguments in --trace-expandBracket arguments are literal and shouldn't be expanded.
Fixes #21671.
Backport: releaseBracket arguments are literal and shouldn't be expanded.
Fixes #21671.
Backport: release3.19.3Raul Tambreraul@tambre.eeRaul Tambreraul@tambre.eehttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5691cmake-gui: Restore linking of Qt resources2021-01-12T10:19:33-05:00Kyle Edwardscmake-gui: Restore linking of Qt resourcesRefactoring in !5224 broke linking of Qt resources, such as the Add/Remove Entry button icons.
Fixes: #21682
Backport: release:HEAD^Refactoring in !5224 broke linking of Qt resources, such as the Add/Remove Entry button icons.
Fixes: #21682
Backport: release:HEAD^3.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5672ci: build separate macOS packages for macOS 10.13+ and macOS 10.10+2021-05-01T14:37:34-04:00Brad Kingci: build separate macOS packages for macOS 10.13+ and macOS 10.10+In order to support modern macOS features like Dark Mode, we need to use
Qt 5.15, which requires macOS 10.13. However, we still want to support
macOS 10.10 as well, for which we need to use Qt 5.9. Build separate
macOS packages for the...In order to support modern macOS features like Dark Mode, we need to use
Qt 5.15, which requires macOS 10.13. However, we still want to support
macOS 10.10 as well, for which we need to use Qt 5.9. Build separate
macOS packages for these use cases.
Fixes: #21606
Issue: #20825
Backport: release:HEAD~1^23.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5671Xcode: Use deterministic object ids for script build phases2021-01-13T07:34:41-05:00Brad KingXcode: Use deterministic object ids for script build phasesThe Xcode "new build system" only considers a script build phase up to
date if it has run before, even if outputs are newer than inputs. Use a
deterministic object id for script build phases associated with custom
commands so that they ...The Xcode "new build system" only considers a script build phase up to
date if it has run before, even if outputs are newer than inputs. Use a
deterministic object id for script build phases associated with custom
commands so that they do not need to re-run after CMake re-generates the
project.
Fixes: #21669
Backport: release3.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5653FindHDF5: Fix finding both debug and release libs2021-01-06T14:58:23-05:00Kris ThielemansFindHDF5: Fix finding both debug and release libsUse `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that the `debug` and `optimized` keywords work.
Fixes: #21637
Backport: release
Topic-rename: FindHDF5-dbg-and-relUse `target_link_libraries` to set `INTERFACE_LINK_LIBRARIES` so that the `debug` and `optimized` keywords work.
Fixes: #21637
Backport: release
Topic-rename: FindHDF5-dbg-and-rel3.19.3Ben BoeckelBen Boeckelhttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5670gitlab-ci: update macOS jobs to use Xcode 12.32021-01-06T13:49:43-05:00Brad Kinggitlab-ci: update macOS jobs to use Xcode 12.3Backport: releaseBackport: release3.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5654FindMPI: remove single quotes from include path2021-01-05T09:03:13-05:00Eduard ValeyevFindMPI: remove single quotes from include pathIntel OneAPI's MPI wraps include paths into single quotes, e.g.:
```
$ mpiicc -show
icc -I'/opt/intel/oneapi/mpi/2021.1.1/include' -L'/opt/intel/oneapi/mpi/2021.1.1/lib/release' -L'/opt/intel/oneapi/mpi/2021.1.1/lib' -Xlinker --enable-ne...Intel OneAPI's MPI wraps include paths into single quotes, e.g.:
```
$ mpiicc -show
icc -I'/opt/intel/oneapi/mpi/2021.1.1/include' -L'/opt/intel/oneapi/mpi/2021.1.1/lib/release' -L'/opt/intel/oneapi/mpi/2021.1.1/lib' -Xlinker --enable-new-dtags -Xlinker -rpath -Xlinker '/opt/intel/oneapi/mpi/2021.1.1/lib/release' -Xlinker -rpath -Xlinker '/opt/intel/oneapi/mpi/2021.1.1/lib' -lmpifort -lmpi -ldl -lrt -lpthread
```
This merge request removes single quotes when sanitizing `_MPI_INCLUDE_PATH`.
Fixes: #21634
Backport: release
Topic-rename: FindMPI-oneapi-single-quotes3.19.3Chuck AtkinsChuck Atkinshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5538gitlab-ci: add jobs to make Linux release packages for aarch642020-12-23T09:35:44-05:00Hi Keygitlab-ci: add jobs to make Linux release packages for aarch64Fixes: #17923
Backport: release:HEAD^2
Topic-rename: rel-linux-aarch64Fixes: #17923
Backport: release:HEAD^2
Topic-rename: rel-linux-aarch643.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5641FetchContent: Relative SOURCE_DIR override cannot be a hard error2020-12-22T15:49:41-05:00Craig ScottFetchContent: Relative SOURCE_DIR override cannot be a hard errorFixes: #21624
Backport: releaseFixes: #21624
Backport: release3.19.3Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5643Tests: Fix ConfigSources test with empty CMAKE_BUILD_TYPE2020-12-22T13:49:33-05:00Brad KingTests: Fix ConfigSources test with empty CMAKE_BUILD_TYPEThe 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=`.
Backport: releaseThe 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=`.
Backport: release3.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5628cmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on Windows2021-01-13T12:05:06-05:00Brad KingcmSystemTools: Revert use of MOVEFILE_WRITE_THROUGH by RenameFile on WindowsRevert the use of `MOVEFILE_WRITE_THROUGH` added by !5161. Using this flag causes the operation to fail frequently in some environments. Drop it for now pending further investigation.
Fixes: #21571
Issue: #19580
Backport: releaseRevert the use of `MOVEFILE_WRITE_THROUGH` added by !5161. Using this flag causes the operation to fail frequently in some environments. Drop it for now pending further investigation.
Fixes: #21571
Issue: #19580
Backport: release3.19.3Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5634Help: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODE2020-12-21T06:03:44-05:00Craig ScottHelp: Fix Sphinx not recognising list in XCODE_LINK_BUILD_PHASE_MODEBackport: releaseBackport: release3.19.3Craig ScottCraig Scotthttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/5686CMakeDetermineCompilerId: Fix invalid escape sequences2021-01-10T05:24:38-05:00Raul Tambreraul@tambre.eeCMakeDetermineCompilerId: Fix invalid escape sequencesFixes #21671.
Backport: releaseFixes #21671.
Backport: release3.19.3Raul Tambreraul@tambre.eeRaul Tambreraul@tambre.ee