Commit 44459dad authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'opencv-numpy-include-dir-windows'

84cd7b3e opencv: set the numpy include path properly on Windows
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Acked-by: T.J. Corona's avatarT.J. Corona <tj.corona@kitware.com>
Merge-request: !259
parents 6182b2b9 84cd7b3e
Pipeline #54940 failed with stage
set(opencv_args)
if (numpy_built_by_superbuild)
if (WIN32)
set(opencv_numpy_include_dir <INSTALL_DIR>/bin/Lib/site-packages/numpy/core/include)
else ()
set(opencv_numpy_include_dir <INSTALL_DIR>/lib/python2.7/site-packages/numpy/core/include)
endif ()
list(APPEND opencv_args
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=${opencv_numpy_include_dir})
endif ()
superbuild_add_project(opencv
DEPENDS python numpy
CMAKE_ARGS
......@@ -13,8 +24,8 @@ superbuild_add_project(opencv
-DWITH_VTK:BOOL=OFF
-DBUILD_opencv_highgui=OFF
-DWITH_QT=OFF
-DPYTHON2_NUMPY_INCLUDE_DIRS:PATH=<INSTALL_DIR>/lib/python2.7/site-packages/numpy/core/include
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib)
-DCMAKE_INSTALL_NAME_DIR:PATH=<INSTALL_DIR>/lib
${opencv_args})
if (WIN32)
superbuild_add_extra_cmake_args(
......
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