summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fetchcontent-reject-CMAKE_TOOLCHAIN_FILE-env-var'Craig Scott2023-02-254-7/+18
|\ | | | | | | | | | | | | | | | | c15674a9cb FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-build 31ef93f19f FetchContent: Only use @-@ replacements for sub-build CMakeLists.txt Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !8248
| * FetchContent: Reject CMAKE_TOOLCHAIN_FILE env var in sub-buildCraig Scott2023-02-243-0/+9
| | | | | | | | | | | | | | | | | | | | The sub-build should never try to use a toolchain file. The toolchain file may itself be getting downloaded by FetchContent. If the CMAKE_TOOLCHAIN_FILE environment variable is set, CMake uses it to initialize the CMake variable of the same name. We need to explicitly clear them before the first project call of the sub-build. Fixes: #24535
| * FetchContent: Only use @-@ replacements for sub-build CMakeLists.txtCraig Scott2023-02-242-7/+9
| | | | | | | | | | | | | | There was a mix of ${} and @-@ substitutions in the CMakeLists.txt.in file. It is sometimes useful to temporarily put ${} evaluations there while working on issues, but they get replaced. Using @ONLY leaves them untouched and uses a consistent substitution method for the whole file.
* | CMake Nightly Date StampKitware Robot2023-02-251-1/+1
| |
* | Merge topic 'msvc-embed-manifest-direct'Brad King2023-02-243-21/+36
|\ \ | | | | | | | | | | | | | | | | | | 0b552eb877 MSVC: Embed manifests directly for non-incremental vs_link_exe links Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8245
| * | MSVC: Embed manifests directly for non-incremental vs_link_exe linksAndrew Ng2023-02-233-21/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids the need to separately execute `mt.exe` to perform the embedding of manifests into the output for non-incremental links. The primary motivation for this change is that this separate execution of `mt.exe` to embed manifests is known to cause intermittent failures due to AV/security scanning. The only change in behavior is that any linker generated manifest will no longer be output as a separate manifest file alongside the output file. Fixes: #24531
* | | Merge topic 'FetchContent-generator-instance'Brad King2023-02-241-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9af0e67ee5 FetchContent: Relay CMAKE_GENERATOR_INSTANCE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8195
| * | | FetchContent: Relay CMAKE_GENERATOR_INSTANCEMáté Ferenc Nagy-Egri2023-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If set, relay `CMAKE_GENERATOR_INSTANCE`. It may affect compiler detection in the subbuild folder. Fixes: #24404
* | | | Merge topic 'PATH-genex-handle-list-of-paths'Brad King2023-02-2412-85/+488
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e395310a21 PATH-genex: handle lists for path decomposition and transformations Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8238
| * | | | PATH-genex: handle lists for path decomposition and transformationsMarc Chevrier2023-02-2112-85/+488
| | | | | | | | | | | | | | | | | | | | Fixes: #24371
* | | | | Merge topic 'tutorial_dependency_inversion'Brad King2023-02-2481-516/+645
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ddf32196c Tutorial: Refactor MathFunctions code Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7789
| * | | | | Tutorial: Refactor MathFunctions codeMarkus Ferrell2023-02-2381-516/+645
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Propagate the refactor in Step 10 MathFunctions through all of the steps. Use MathFunctions/MathFunctions.cxx instead of Tutorial.cxx to determine which sqrt library is called. Adds .h files which correspond to their .cxx files by name.
* | | | | | Merge topic 'GenerateExportHeader-Fix-Clang-support-on-Windows'Brad King2023-02-248-6/+92
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e19936320 GenerateExportHeader: Fix Clang support on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Adrien De Coninck <deconinck.adrien@gmail.com> Merge-request: !8221
| * | | | | | GenerateExportHeader: Fix Clang support on WindowsCorentin Damman2023-02-238-6/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Clang with Visual Studio, the GenerateExportHeader function generates the DEPRECATED definition "__attribute__ ((__deprecated__))", because Clang can compile such instruction. However, if a user wants to compile the library with this generated header with MSVC, the declaration is not valid. We suggest to always use the DEPRECATED definition "__declspec(deprecated)" on Windows, which is valid for both Clang and MSVC.
* | | | | | | Merge topic 'find_package-PACKAGENAME_ROOT'Brad King2023-02-2430-75/+761
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df9c4b1872 find_package: Use <PACKAGENAME>_ROOT variables as search prefixes 4da27a73bd Help: Document <PackageName>_ROOT variable ordering using an ordered list bfeb16bd5b cmFindPackageCommand: Refactor CMP0074 logic to de-duplicate lookups c0fcd07e6f cmFindPackageCommand: Factor out methods for package root stack management acd9636d9d cmSystemTools: Add helpers for reading and parsing PATH env vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8240
| * | | | | | | find_package: Use <PACKAGENAME>_ROOT variables as search prefixesBrad King2023-02-2327-3/+626
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend commit eb35d8884b (find_package: Use PackageName_ROOT variables as search prefixes, 2018-03-15, v3.12.0-rc1~349^2) to also check upper-case `<PACKAGENAME>_ROOT` variables. Add policy `CMP0144` to enable the behavior in a compatible way. Fixes: #24403
| * | | | | | | Help: Document <PackageName>_ROOT variable ordering using an ordered listBrad King2023-02-232-26/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make room to add more steps in a documented order.
| * | | | | | | cmFindPackageCommand: Refactor CMP0074 logic to de-duplicate lookupsBrad King2023-02-233-25/+34
| | | | | | | |
| * | | | | | | cmFindPackageCommand: Factor out methods for package root stack managementBrad King2023-02-232-31/+41
| | | | | | | |
| * | | | | | | cmSystemTools: Add helpers for reading and parsing PATH env varsBrad King2023-02-232-0/+29
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.26'Brad King2023-02-240-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge topic 'find-openssl-find-pthread' into release-3.26Brad King2023-02-241-1/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24c7279a6f FindOpenSSL: Search for -pthread flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8246
* | \ \ \ \ \ \ \ Merge topic 'find-openssl-find-pthread'Brad King2023-02-241-1/+14
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 24c7279a6f FindOpenSSL: Search for -pthread flag Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8246
| * | | | | | | | FindOpenSSL: Search for -pthread flagKyle Edwards2023-02-231-1/+14
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because -pthread doesn't begin with -l, it doesn't show up in the pkgconfig LIBRARIES variable, causing FindOpenSSL to not add the Threads::Threads dependency. Explicitly search LDFLAGS_EXTRA for -pthread and add the dependency if it's found. Fixes: #24532
* | | | | | | | CMake Nightly Date StampKitware Robot2023-02-241-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'gitlab-issue-template'Brad King2023-02-231-0/+9
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e408157e1b gitlab: Add default issue template Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !8244
| * | | | | | gitlab: Add default issue templateBrad King2023-02-221-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Populate issue descriptions by default with a note directing reporters to other resources they should consider using first. Make it a comment so that the content does not actually render in the report not removed.
* | | | | | | Merge branch 'release-3.26'Brad King2023-02-230-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'ci-msvc-14.35' into release-3.26Brad King2023-02-231-11/+11
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8242
* | \ \ \ \ \ \ Merge topic 'ci-msvc-14.35'Brad King2023-02-231-11/+11
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9da7009bfc gitlab-ci: Update Windows builds to MSVC 14.35 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8242
| * | | | | | | gitlab-ci: Update Windows builds to MSVC 14.35 toolsetBrad King2023-02-221-11/+11
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2023-02-231-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge branch 'release-3.26'Brad King2023-02-220-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | CMake 3.26.0-rc4v3.26.0-rc4Brad King2023-02-221-1/+1
| | | | | |
* | | | | | Merge topic 'iar-lang-vars'Brad King2023-02-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b365c461f IAR: Tolerate variables named for languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8235
| * | | | | | IAR: Tolerate variables named for languagesJoakim Lönnberg2023-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a project or user sets a variable or cache entry named `C` or `CXX`, we were previously comparing those language names to the value of that variable, rather than the name itself. Double-quote the string to take advantage of policy `CMP0054`, but also add "x" prefixes to support projects that do not set the policy. This extends a similar fix from commit c8eb357738 (CompilerId: Tolerate variables named for languages, 2021-06-17, v3.21.0-rc1~9^2).
* | | | | | | Merge topic 'fix_parallel_hdf5'Brad King2023-02-221-4/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18c2970a97 FindHDF5: Fix detection of Parallel HDF5 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8234
| * | | | | | | FindHDF5: Fix detection of Parallel HDF5Weiqun Zhang2023-02-211-4/+16
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To detect Parallel HDF5, the output of `h5pcc -showconfig` was compared with `Parallel HDF5: yes`. However, the Boolean flag is not always `yes` or `no`, because it was set by the value in `HDF5_ENABLE_PARALLEL` if CMake was used for the configuration. This commit instead checks to see if the value is interpreted by CMake as "true".
* | | | | | | Merge topic 'update-curl'Brad King2023-02-22362-9803/+14333
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7e206fd58 Utilities: Update hard-coded try_compile results for curl 7.88.1 ce1550f178 Merge branch 'upstream-curl' into update-curl 11ba4361aa curl 2023-02-20 (046209e5) 37cceabc65 curl: Update script to get curl 7.88.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8236
| * | | | | | | Utilities: Update hard-coded try_compile results for curl 7.88.1Brad King2023-02-211-0/+1
| | | | | | | |
| * | | | | | | Merge branch 'upstream-curl' into update-curlBrad King2023-02-21360-9802/+14331
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2023-02-20 (046209e5)
| | * | | | | | | curl 2023-02-20 (046209e5)Curl Upstream2023-02-21360-9815/+14392
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 046209e561b7e9b5aab1aef7daebf29ee6e6e8c7 (curl-7_88_1).
| * | | | | | | | curl: Update script to get curl 7.88.1Brad King2023-02-211-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'ci-macos-universal'Brad King2023-02-226-0/+49
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557c3934ee gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !8237
| * | | | | | | | gitlab-ci: Add nightly jobs covering macOS universal binaries on x86_64Brad King2023-02-216-0/+49
| |/ / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2023-02-221-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'qt-sizetype'Brad King2023-02-218-20/+45
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cda8a3993 cmake-gui: Fix conversion warnings about Qt indexing types Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !8233
| * | | | | | | cmake-gui: Fix conversion warnings about Qt indexing typesBrad King2023-02-208-20/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt 5 uses `int` for indexing, and Qt 6 uses `qsizetype`. Add helper types and casts to the appropriate type to avoid conversion warnings.
* | | | | | | | Merge topic 'unlimited-version-compare'Brad King2023-02-212-7/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa86e8ddfd Remove component size limit for version comparisons 7e730d8f7f Tests: Add cases for cmSystemTools::VersionCompare Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: scivision <michael@scivision.dev> Merge-request: !8231
| * | | | | | | | Remove component size limit for version comparisonsDavid Gobbi2023-02-202-9/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VersionCompare() function converted version components to 'unsigned long' prior to comparing them. Any version components too large for 'unsigned long' were treated as equal to ULONG_MAX. This impacted operators like VERSION_GREATER, VERSION_LESS, and VERSION_EQUAL. The new code does not limit the length of the version components for valid comparisons.