Add path to opencv libs to windows testing path.

9fc4869c · T.J. Corona · c3ee1be3 · 9fc4869c
Commit 9fc4869c authored Mar 22, 2017 by T.J. Corona
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 1 deletion

cmake/CTestCustom.cmake.in cmake/CTestCustom.cmake.in +7 -1

No files found.
--- a/cmake/CTestCustom.cmake.in
+++ b/cmake/CTestCustom.cmake.in
@@ -132,8 +132,14 @@ ignore_project_warnings(vxl)
 ignore_project_warnings(zeromq)

 if (WIN32)
+  if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/install/x64/vc14)
+    set(opencv_path_ext ";${CMAKE_CURRENT_LIST_DIR}/install/x64/vc14/bin")
+  elseif (EXISTS ${CMAKE_CURRENT_LIST_DIR}/install/x64/vc12)
+    set(opencv_path_ext ";${CMAKE_CURRENT_LIST_DIR}/install/x64/vc12/bin")
+  endif()
+
  set(ENV{PATH}
-    "$ENV{PATH};${CMAKE_CURRENT_LIST_DIR}/install/bin;${CMAKE_CURRENT_LIST_DIR}/install/lib")
+    "$ENV{PATH};${CMAKE_CURRENT_LIST_DIR}/install/bin;${CMAKE_CURRENT_LIST_DIR}/install/lib${opencv_path_ext}")
 endif ()

 # Regular expression for error exceptions during build process