Skip to content

cmake: flatten build tree, tidy up base dir variables#22192

Closed
vszakats wants to merge 4 commits into
curl:masterfrom
vszakats:cm-uninst-loc
Closed

cmake: flatten build tree, tidy up base dir variables#22192
vszakats wants to merge 4 commits into
curl:masterfrom
vszakats:cm-uninst-loc

Conversation

@vszakats

@vszakats vszakats commented Jun 26, 2026

Copy link
Copy Markdown
Member
  • drop generated subdir, move these files to build root.
    To move them next to CPack and other config files, and to avoid
    a subdirectory for only 2 files.
    Follow-up to 6932849 CMake: Improve config installation #2849

  • add 'Consumed variables' comment for CMake/cmake_uninstall.in.cmake.

  • move generated cmake_uninstall.cmake to the build root directory
    (from CMake/). To:

    • avoid creating a CMake subdirectory within the build directory
      with this single file in it.
    • move it next to its cmake_install.cmake counterpart.
    • move it next to install_manifest.txt which it relies on.

    Follow-up to 27e2a47

  • Use PROJECT_SOURCE_DIR for these files, replacing
    CMAKE_CURRENT_SOURCE_DIR, to make it consistent with rest of CMake
    sources, and to reduce ambiguity in CMake/cmake_uninstall.in.cmake
    template.

Follow-up to 8198e38 #22188
Follow-up to 4839029 #22187
Follow-up to 9126eb5 #15331


Note: the ninja curl_uninstall feature does not work in certain cases.
It also does not remove empty directories.

vszakats added 4 commits June 26, 2026 16:20
To move them next to CPack and other config files.

Follow-up to 6932849 curl#2849
To avoid crearing a CMake subdir within the build dir with this single
file in it.
To move it next to its cmake_install.cmake counterparth
To move it next to install_manifest.txt which it relies on.
@vszakats vszakats added the cmake label Jun 26, 2026
@github-actions github-actions Bot added the build label Jun 26, 2026
@vszakats vszakats closed this in a7e8016 Jun 26, 2026
@vszakats vszakats deleted the cm-uninst-loc branch June 26, 2026 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Development

Successfully merging this pull request may close these issues.

1 participant