Merge pull request #580 from mleotta/dev/fix-win32-path

Fix PATH in setup_KWIVER.bat
Kitware · Jul 30, 2018 · b8872c3 · b8872c3
2 parents 3526352 + 606bfba
commit b8872c3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/CMake/setup_KWIVER.bat.in b/CMake/setup_KWIVER.bat.in
@@ -22,7 +22,7 @@ set config=release
 
 :Start
 
-set PATH=%~dp0/bin/%config%;%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%;@EXTRA_WIN32_PATH@
+set PATH=%PATH%;%~dp0/bin/%config%;%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%;@EXTRA_WIN32_PATH@
 
 set KWIVER_PLUGIN_PATH=%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%
 

diff --git a/doc/release-notes/release.txt b/doc/release-notes/release.txt
@@ -313,6 +313,12 @@ Unit Tests
 Fixes since v1.1.1
 ------------------
 
+General
+
+ * Fixed an issue in the generated setup_KWIVER.bat script in which the
+   PATH environment variable was being replaced with KWIVER paths rather
+   than appending those paths.
+
 Sprokit
 
  * Top level pipeline descriptions that are sourced from a stream do
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,7 +22,7 @@ set config=release @@
     :Start
-    set PATH=%~dp0/bin/%config%;%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%;@EXTRA_WIN32_PATH@
+    set PATH=%PATH%;%~dp0/bin/%config%;%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%;@EXTRA_WIN32_PATH@
     set KWIVER_PLUGIN_PATH=%~dp0/lib/%config%/modules;%~dp0/lib/%config%/sprokit;%~dp0/lib/sprokit/%config%
@@ Expand Down @@