summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindGLUT-remove-undocumented-vars'Brad King2022-05-182-4/+5
|\ | | | | | | | | | | | | 6c053e68df FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARY Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7273
| * FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARYLetu Ren2022-05-172-4/+5
| | | | | | | | Fixes: #23370
* | Merge topic 'fetchcontent-subbuild-config-type-fix'Brad King2022-05-181-3/+3
|\ \ | | | | | | | | | | | | | | | | | | 82f3ceb26b FetchContent: Use Debug rather than Release for sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7272
| * | FetchContent: Use Debug rather than Release for sub-buildCraig Scott2022-05-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | The config used can be part of the path to the sub-build. On some platforms, there are restrictions on the length of paths or file names. Use Debug rather than Release because the former is shorter. When CMAKE_CONFIGURATION_TYPES is left at its default, this also makes the path the same as the previous default before 10865c8e5f (FetchContent: Hard-code a config for the sub-build, 2022-05-01) .
* | | CMake Nightly Date StampKitware Robot2022-05-181-1/+1
| | |
* | | Merge topic 'try_compile-project-platform-vars'Brad King2022-05-1716-2/+125
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6562ff579 try_compile: Add option to skip passing platform variables 4843a37676 try_compile: Propagate platform variables in project-mode too Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7265
| * | | try_compile: Add option to skip passing platform variablesBrad King2022-05-1610-3/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_TRY_COMPILE_NO_PLATFORM_VARIABLES` variable to tell `try_compile` not to pass platform variables to the test project. Issue: #23219
| * | | try_compile: Propagate platform variables in project-mode tooBrad King2022-05-1614-2/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add policy CMP0137 to propagate both our builtin variables and those listed by `CMAKE_TRY_COMPILE_PLATFORM_VARIABLES` to `try_compile` whole-project builds. Inspired-by: Alexander Neumann <Alexander.Neumann@hamburg.de> Fixes: #23219
* | | | Merge topic 'update-curl'Brad King2022-05-1727-159/+291
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71747a28ea Merge branch 'upstream-curl' into update-curl 9d8f81f4f8 curl 2022-05-11 (462196e6) 02902188ec curl: Update script to get curl 7.83.1 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7267
| * \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2022-05-1626-158/+290
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-curl: curl 2022-05-11 (462196e6)
| | * | | | curl 2022-05-11 (462196e6)Curl Upstream2022-05-1626-158/+290
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 462196e6b4a47f924293a0e26b8e9c23d37ac26f (curl-7_83_1).
| * | | | | curl: Update script to get curl 7.83.1Brad King2022-05-161-1/+1
| | | | | |
* | | | | | Merge topic 'findzlib-static'Brad King2022-05-171-6/+16
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f0b9663a4 FindZLIB: fix ZLIB_USE_STATIC_LIBS on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7262
| * | | | | | FindZLIB: fix ZLIB_USE_STATIC_LIBS on WindowsPeter Würth2022-05-131-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - on Windows, the ZLIB_USE_STATIC_LIBS options requires a reordering of the search names in order to prefer the static library, since in most cases both static and shared libraries are built - add zlibwapi[d] library name for the contrib/vstudio builds - add lib prefix and .dll.a suffix for the win32/Makefile.gcc build Fixes #23140
* | | | | | | Merge topic 'install-all-components-fix'Brad King2022-05-176-10/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b0c8e31b54 install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTS Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7263
| * | | | | | | install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTSNils Gladitz2022-05-166-10/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23494
* | | | | | | | Merge branch 'release-3.23'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'release-3.22' into release-3.23Brad King2022-05-170-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'FortranCInterface-gcc12' into release-3.22Brad King2022-05-161-0/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7266
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FortranCInterface-gcc12' into release-3.23Brad King2022-05-171-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7266
* | | | | | | | | | | Merge topic 'FortranCInterface-gcc12'Brad King2022-05-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb616d43d6 FortranCInterface: Fix failure with gfortran 12 and Clang Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7266
| * | | | | | | | | | FortranCInterface: Fix failure with gfortran 12 and ClangBrad King2022-05-161-0/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The C flags added by commit 6a0ce19ce1 (FortranCInterface: Fix compatibility with GCC gfortran 12 LTO, 2022-01-19, v3.22.2~5^2) should only be added for the GNU C compiler. Fixes: #23500 Issue: #23123
* | | | | | | | | | Merge topic 'ci-intel-compiler'Brad King2022-05-171-0/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb3feb1efe gitlab-ci: add jobs testing Intel 2022.1.0 compilers on Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7270
| * | | | | | | | | gitlab-ci: add jobs testing Intel 2022.1.0 compilers on LinuxBrad King2022-05-161-0/+14
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the classic compiler version is 2021.6.0, but we still have it in the 2022.1.0 base image.
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'CMAKE_PROJECT_TOP_LEVEL_INCLUDES'Brad King2022-05-1623-32/+170
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6c34b0353 project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection point 8aa29a1793 CMakeDetermineSystem: Remove unreachable code Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7250
| * | | | | | | | project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection pointCraig Scott2022-05-1322-31/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #22685
| * | | | | | | | CMakeDetermineSystem: Remove unreachable codeCraig Scott2022-05-081-1/+0
| | | | | | | | |
* | | | | | | | | Merge topic 'test-clang-15'Brad King2022-05-162-2/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 91987aec24 Tests: Add missing return types to C function prototypes Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7260
| * | | | | | | | | Tests: Add missing return types to C function prototypesBrad King2022-05-132-2/+3
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | These were diagnosed by a Clang 15 development version.
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cuda-arch-off-vs' into release-3.23Brad King2022-05-161-4/+5
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7261
* | \ \ \ \ \ \ \ \ Merge topic 'cuda-arch-off-vs'Brad King2022-05-161-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9fe41ecf36 VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFF Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !7261
| * | | | | | | | VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFFBrad King2022-05-131-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we add no CUDA architecture flags, write an empty `CodeGeneration` field to tell the CUDA Toolkit's VS integration not to add its default flags. We already use this approach for `CMAKE_CUDA_ARCHITECTURES=all` so that the `-arch=all` flag can be added via `AdditionalOptions`. Fixes: #23490
* | | | | | | | | Merge topic 'fetchcontent-subbuild-config-type'Craig Scott2022-05-161-2/+11
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10865c8e5f FetchContent: Hard-code a config for the sub-build Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Merge-request: !7228
| * | | | | | | | | FetchContent: Hard-code a config for the sub-buildCraig Scott2022-05-131-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the main project overrides CMAKE_CONFIGURATION_TYPES such that there is no Debug configuration, some multi-config generators can fail because they might assume Debug by default (Visual Studio might do this). Always specify the configuration for multi-config generators so that we don't rely on any such defaults. Fixes: #23177
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-161-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-151-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-141-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'presets-pathListSep'Brad King2022-05-1311-0/+77
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba969ce5fe cmake-presets: add ${pathListSep} macro Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7234
| * | | | | | | | cmake-presets: add ${pathListSep} macroErin Melucci2022-05-1211-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23282
* | | | | | | | | Merge topic 'FindGLUT-system-include-dirs'Brad King2022-05-131-0/+14
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8041ca5df0 FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/include Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7252
| * | | | | | | | | FindGLUT: Fix GLUT_INCLUDE_DIRS with pkg-config and /usr/includeLetu Ren2022-05-121-0/+14
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #23474
* | | | | | | | | Merge topic 'externalproject-uses-terminal-flags'Brad King2022-05-132-2/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1c2cb0436 ExternalProject: Make SVN interactive with USES_TERMINAL_{DOWNLOAD,UPDATE} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7248
| * | | | | | | | | ExternalProject: Make SVN interactive with USES_TERMINAL_{DOWNLOAD,UPDATE}Michael Durso Jr2022-05-122-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ExternalProject_Add() supports USES_TERMINAL_* flags to enable user input for different steps. The Subversion download options ignored these flags when checking out or updated a Subversion repo. Fixes: #23348
* | | | | | | | | | Merge topic 'doc-install-example-components'Brad King2022-05-131-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 308b698f5d Help: Make install() example component names more consistent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7240
| * | | | | | | | | | Help: Make install() example component names more consistentJean-Christophe Fillion-Robin2022-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit updates the documentation so that the component examples are specified using title case to match convention used in both the existing `Installing Exports` section and in the "Mastering CMake" book.
* | | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / | |/| | | | | | | | |
generated by cgit v0.12 at 2025-09-13 04:48:09 (GMT)