Commit d77bd37b authored by T.J. Corona's avatar T.J. Corona Committed by Kitware Robot

Merge topic 'opencv-windows-set-path'

9fc4869c Add path to opencv libs to windows testing path.
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !252
parents 7cfc6a5a 9fc4869c
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment