[06/10] cmake (Windows): let the `.dll` files are found when running the tests

Commit Message

Jean-Noël Avila via GitGitGadget Sept. 25, 2020, 2:28 p.m. UTC

From: Johannes Schindelin <[e-mail]>

Contrary to Unix-ish platforms, the dependencies' shared libraries are
not usually found in one central place. In our case, since we use
`vcpkg`, they are to be found inside the `compat/vcbuild/vcpkg/` tree.

Let's make sure that they are in the search path when running the tests.

Signed-off-by: Johannes Schindelin <[e-mail]>
---
 contrib/buildsystems/CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

Comments

Eric Sunshine Sept. 25, 2020, 7:48 p.m. UTC | #1

On Fri, Sep 25, 2020 at 10:28 AM Johannes Schindelin via GitGitGadget
<[e-mail]> wrote:
> cmake (Windows): let the `.dll` files are found when running the tests

I'm having trouble parsing this. Maybe you want s/let/ensure/ ?

Johannes Schindelin Sept. 26, 2020, 9 p.m. UTC | #2

Hi Eric,

On Fri, 25 Sep 2020, Eric Sunshine wrote:

> On Fri, Sep 25, 2020 at 10:28 AM Johannes Schindelin via GitGitGadget
> <[e-mail]> wrote:
> > cmake (Windows): let the `.dll` files are found when running the tests
>
> I'm having trouble parsing this. Maybe you want s/let/ensure/ ?

Right, that does not parse at all. I did `s/are/be/` instead.

Thanks,
Dscho

Patch

diff --git a/contrib/buildsystems/CMakeLists.txt b/contrib/buildsystems/CMakeLists.txt
index e66ae137c2..5a4e0ccb01 100644
--- a/contrib/buildsystems/CMakeLists.txt
+++ b/contrib/buildsystems/CMakeLists.txt
@@ -942,6 +942,9 @@  file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "X='${EXE_EXTENSION}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_GETTEXT='${NO_GETTEXT}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "RUNTIME_PREFIX='${RUNTIME_PREFIX}'\n")
 file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "NO_PYTHON='${NO_PYTHON}'\n")
+if(WIN32)
+	file(APPEND ${CMAKE_BINARY_DIR}/GIT-BUILD-OPTIONS "PATH=\"$PATH:$TEST_DIRECTORY/../compat/vcbuild/vcpkg/installed/x64-windows/bin\"\n")
+endif()
 
 #Make the tests work when building out of the source tree
 get_filename_component(CACHE_PATH ${CMAKE_CURRENT_LIST_DIR}/../../CMakeCache.txt ABSOLUTE)