diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2023-04-26 16:27:14 +0800 |
|---|---|---|
| committer | Federico Mena Quintero <federico@gnome.org> | 2023-05-03 17:13:16 -0600 |
| commit | 7e712794a9baeceed8477b05472086a288e7a43f (patch) | |
| tree | c815fea8ff13fd034f7b34a3170baad31fdfb725 | |
| parent | 7cc5ca1e92ed6961b62710c7341e455ac24c0dd1 (diff) | |
| download | librsvg-7e712794a9baeceed8477b05472086a288e7a43f.tar.gz | |
Visual Studio: Fix running Rust tests
We did not update the NMake Makefiles for running the Rust tests previously, so
update things here so that things will run. Make sure the Rust tests can find
the dependent DLLs (GIO, GObject, libxml2 and so on) by including $(BINDIR).
Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/824>
| -rw-r--r-- | win32/Makefile.vc | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/win32/Makefile.vc b/win32/Makefile.vc index 44af22e7..4c47f2a9 100644 --- a/win32/Makefile.vc +++ b/win32/Makefile.vc @@ -45,15 +45,13 @@ tests: all $(rsvg_tests) @for %%x in ($(rsvg_tests)) do %%x rsvg_rust_tests: - @set PATH=%PATH%;%HOMEPATH%\.cargo\bin - @set CARGO_TARGET_DIR=..\win32\vs$(VSVER)\$(CFG)\$(PLAT)\obj\rsvg_c_api + @set PATH=$(BINDIR);%PATH%;%HOMEPATH%\.cargo\bin @set GTK_LIB_DIR=$(LIBDIR);$(LIB) - $(RUSTUP_CMD) - @cd .. - $(CARGO_CMD:build=test) --verbose - @cd win32 + @set SYSTEM_DEPS_LIBXML2_LIB=$(LIBXML2_LIB:.lib=) + @if not "$(PKG_CONFIG_PATH)" == "" set PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) + @if not "$(PKG_CONFIG)" == "" set PKG_CONFIG=$(PKG_CONFIG) + $(CARGO_CMD:build=test) $(RUST_VERBOSE_FLAG) @set GTK_LIB_DIR= - @set CARGO_TARGET_DIR= # Include the rules for build directory creation and code generation !include generate-msvc.mak |