git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 3/4] cmake: add a preparatory work-around to accommodate `vcpkg`

From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date
Mar 28, 2021, 03:19 UTC
Message-ID
<YF/117C6LcNGQ7sm@danh.dev>
In-Reply-To
<543fd0f5d7e5ee297364d1d28091f2004a35f2d0.1616886386.git.gitgitgadget@gmail.com>
On 2021-03-27 23:06:24+0000, Johannes Schindelin via GitGitGadget <gitgitgadget@gmail.com> wrote:
Show 38 quoted lines
> From: Johannes Schindelin <johannes.schindelin@gmx.de>
> 
> We are about to add support for installing the `.dll` files of Git's
> dependencies (such as libcurl) in the CMake configuration. The `vcpkg`
> ecosystem from which we get said dependencies makes that relatively
> easy: simply turn on `X_VCPKG_APPLOCAL_DEPS_INSTALL`.
> 
> However, current `vcpkg` introduces a limitation if one does that:
> While it is totally cool with CMake to specify multiple targets within
> one invocation of `install(TARGETS ...) (at least according to
> https://cmake.org/cmake/help/latest/command/install.html#command:install),
> `vcpkg`'s parser insists on a single target per `install(TARGETS ...)`
> invocation.
> 
> Well, that's easily accomplished: Let's feed the targets individually to
> the `install(TARGETS ...)` function in a `foreach()` look.
> 
> This also has the advantage that we do not have to manually cull off the
> two entries from the `${PROGRAMS_BUILT}` array before scheduling the
> remainder to be installed into `libexec/git-core`. Instead, we iterate
> through the array and decide for each entry where it wants to go.
> 
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
> ---
>  contrib/buildsystems/CMakeLists.txt | 14 +++++++++-----
>  1 file changed, 9 insertions(+), 5 deletions(-)
> 
> diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
> index da2811ae3aad..a166be0eb1b8 100644
> --- a/contrib/buildsystems/CMakeLists.txt
> +++ b/contrib/buildsystems/CMakeLists.txt
> @@ -811,15 +811,19 @@ list(TRANSFORM git_shell_scripts PREPEND "${CMAKE_BINARY_DIR}/")
>  list(TRANSFORM git_perl_scripts PREPEND "${CMAKE_BINARY_DIR}/")
>  
>  #install
> -install(TARGETS git git-shell
> +foreach(program ${PROGRAMS_BUILT})
> +if(${program} STREQUAL git OR ${program} STREQUAL git-shell)

Please don't use `${}` around variable inside `if()`, and quote the string. CMake has a quirk with the `${}` inside if (expanded variable will be treated as a variable if it is defined, or string otherwise). Unquoted string will be seen as a variable if it's defined, string otherwise. IOW, suggested command:

	if (program STREQUAL "git" OR program STREQUAL "git-shell")

We also have another problem with quoted arguments could be interpreted as variable or keyword if CMP0054 policy not enabled, too. I think it's better to have it enabled, but it's not in the scope of this patch.

 https://cmake.org/cmake/help/latest/policy/CMP0054.html
-- 
Danh
Previous: Johannes Schindelin via GitGitGadgetNext: Johannes Schindelin
Message 5 of 12 in “cmake: learn to optionally skip linking dashed built-ins”
  1. 0/4 cmake: learn to optionally skip linking dashed built-insJohannes Schindelin via GitGitGadget, Mar 27, 2021
  2. 1/4 cmake: support SKIP_DASHED_BUILT_INSJohannes Schindelin via GitGitGadget, Mar 27, 2021
  3. 2/4 cmake(install): fix double .exe suffixesDennis Ameling via GitGitGadget, Mar 27, 2021
  4. 3/4 cmake: add a preparatory work-around to accommodate `vcpkg`Johannes Schindelin via GitGitGadget, Mar 27, 2021
  5. Đoàn Trần Công DanhMar 28, 2021
  6. Johannes SchindelinMar 29, 2021
  7. 4/4 cmake(install): include vcpkg dllsDennis Ameling via GitGitGadget, Mar 27, 2021
  8. 0/4 cmake: learn to optionally skip linking dashed built-insJohannes Schindelin via GitGitGadget, Mar 29, 2021
  9. 1/4 cmake: support SKIP_DASHED_BUILT_INSJohannes Schindelin via GitGitGadget, Mar 29, 2021
  10. 2/4 cmake(install): fix double .exe suffixesDennis Ameling via GitGitGadget, Mar 29, 2021
  11. 4/4 cmake(install): include vcpkg dllsDennis Ameling via GitGitGadget, Mar 29, 2021
  12. 3/4 cmake: add a preparatory work-around to accommodate `vcpkg`Johannes Schindelin via GitGitGadget, Mar 29, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.