summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Dependency providers: Add find_package and FetchContent supportCraig Scott2022-05-2450-38/+957
| | | Fixes: #22619
* FetchContent: Don't discard non-empty SOURCE_DIR and BINARY_DIRCraig Scott2022-05-181-3/+9
|
* FetchContent: Don't leak internal variablesCraig Scott2022-05-181-3/+11
|
* cmFindPackageCommand: Handle Makefile variable definitions more robustlyCraig Scott2022-05-172-11/+19
| | | | | | | | | | | | | | | | | | | During argument parsing in InitialPass(), Makefile variables were being added for components. Most other such variables were set in the call to SetModuleVariables(), which happens much later. Both sets of variables were then restored to their previous values as part of a call to AppendSuccessInformation(), but that is not an obvious nor robust place to undo those variable changes. InitialPass() also pushes a new item to the package root stack, but the corresponding pop was in AppendSuccessInformation(). Again, this puts a symmetric operation in an asymmetric place. Refactor the code slightly such that Makefile variables are set in one clear location, then restored later in the same function. Also move the package root stack pop into the same function as the push. AppendSuccessInformation() now has one clear responsibility and doesn't perform any unrelated cleanup on behalf of InitialPass().
* 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
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | |
| * | | | | | | | Merge topic 'ccmake-delete-cache' into release-3.23Brad King2022-05-132-21/+17
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2defe9ff95 ccmake: Fix crash when deleting all cache entries e1c85e29f4 ccmake: Move Initialization of Fields Inline Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7257
* | \ \ \ \ \ \ \ \ Merge topic 'ccmake-delete-cache'Brad King2022-05-132-21/+17
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2defe9ff95 ccmake: Fix crash when deleting all cache entries e1c85e29f4 ccmake: Move Initialization of Fields Inline Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7257
| * | | | | | | | | ccmake: Fix crash when deleting all cache entriesMartin Duffy2022-05-122-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents crash when deleting all cache entries. Additionally, if advanced entries are hidden, no longer show the first advanced entry when deleting all visible entries. Fixes: #23499
| * | | | | | | | | ccmake: Move Initialization of Fields InlineMartin Duffy2022-05-122-12/+6
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | Move initialization of simple fields in cmCursesMainForm inline.
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-05-130-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'FindPkgConfig-LIBRARY_PATH' into release-3.22Brad King2022-05-121-1/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !7258
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge topic 'FindPkgConfig-LIBRARY_PATH' into release-3.23Brad King2022-05-131-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7258
* | | | | | | | | | | Merge topic 'FindPkgConfig-LIBRARY_PATH'Brad King2022-05-131-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11c8da94d4 FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: buildbot <buildbot@kitware.com> Merge-request: !7258
| * | | | | | | | | | FindPkgConfig: Fix preservation of ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}Brad King2022-05-121-1/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the ENV save/restore added by commit 36979f5b43 (FindPkgConfig: Tolerate PKG_CONFIG_SYSTEM_LIBRARY_PATH in environment, 2021-07-13, v3.22.0-rc1~407^2) to unset the variable if it was originally not set. While at it, clarify the value to which we temporarily set it. The `pkg-config` and `pkgconf` tools only check that the variable is set, and do not care about the value. Set it to a more true-looking value. Issue: #22148
* | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'FindPython-3.12' into release-3.23Brad King2022-05-133-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca2877c039 FindPython: add support for Python 3.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7255
* | \ \ \ \ \ \ \ \ \ Merge topic 'FindPython-3.12'Brad King2022-05-133-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca2877c039 FindPython: add support for Python 3.12 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7255
| * | | | | | | | | | FindPython: add support for Python 3.12Michael Hirsch2022-05-123-3/+3
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'ci-msvc-19.32' into release-3.23Brad King2022-05-131-4/+4
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7259
* | | | | | | | | | Merge topic 'ci-msvc-19.32'Brad King2022-05-131-4/+4
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cc93d2af08 gitlab-ci: Update Windows builds to MSVC 19.32 toolset Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7259
| * | | | | | | | | gitlab-ci: Update Windows builds to MSVC 19.32 toolsetBrad King2022-05-121-4/+4
| |/ / / / / / / /
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-120-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
generated by cgit v0.12 at 2025-09-05 19:23:14 (GMT)