moved Python bindings source code into src subdirectory; preparing to add python/doc and python/test subdirectories
This commit is contained in:
@@ -5,7 +5,7 @@ project(opencv_python)
|
||||
|
||||
include_directories(${PYTHON_INCLUDE_PATH})
|
||||
include_directories(
|
||||
${CMAKE_CURRENT_SOURCE_DIR}
|
||||
"${CMAKE_CURRENT_SOURCE_DIR}/src"
|
||||
"${CMAKE_SOURCE_DIR}/modules/core/include"
|
||||
"${CMAKE_SOURCE_DIR}/modules/imgproc/include"
|
||||
"${CMAKE_SOURCE_DIR}/modules/video/include"
|
||||
@@ -30,7 +30,7 @@ set(opencv_hdrs "${CMAKE_SOURCE_DIR}/modules/core/include/opencv2/core/core.hpp"
|
||||
"${CMAKE_SOURCE_DIR}/modules/features2d/include/opencv2/features2d/features2d.hpp"
|
||||
"${CMAKE_SOURCE_DIR}/modules/calib3d/include/opencv2/calib3d/calib3d.hpp"
|
||||
"${CMAKE_SOURCE_DIR}/modules/objdetect/include/opencv2/objdetect/objdetect.hpp"
|
||||
"${CMAKE_SOURCE_DIR}/modules/python/opencv_extra_api.hpp")
|
||||
"${CMAKE_SOURCE_DIR}/modules/python/src/opencv_extra_api.hpp")
|
||||
|
||||
set(generated_hdrs
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/pyopencv_generated_funcs.h"
|
||||
@@ -43,27 +43,27 @@ if(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
|
||||
endif()
|
||||
|
||||
file(GLOB lib_srcs "*.cpp")
|
||||
file(GLOB lib_hdrs "*.h")
|
||||
file(GLOB lib_srcs "src/*.cpp")
|
||||
file(GLOB lib_hdrs "src/*.h")
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/generated0.i
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen.py ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/api
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/defs
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen.py
|
||||
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src/gen.py" "${CMAKE_CURRENT_SOURCE_DIR}/src"
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/api
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/defs
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/gen.py
|
||||
)
|
||||
|
||||
add_custom_command(
|
||||
OUTPUT ${generated_hdrs}
|
||||
COMMAND ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/gen2.py ${CMAKE_CURRENT_BINARY_DIR} ${opencv_hdrs}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/gen2.py
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/hdr_parser.py
|
||||
COMMAND ${PYTHON_EXECUTABLE} "${CMAKE_CURRENT_SOURCE_DIR}/src/gen2.py" ${CMAKE_CURRENT_BINARY_DIR} ${opencv_hdrs}
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/gen2.py
|
||||
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/src/hdr_parser.py
|
||||
DEPENDS ${opencv_hdrs}
|
||||
)
|
||||
|
||||
set(the_target "opencv_python")
|
||||
add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${CMAKE_CURRENT_BINARY_DIR}/generated0.i opencv2x.h opencv_extra_api.hpp ${generated_hdrs})
|
||||
add_library(${the_target} ${lib_srcs} ${lib_hdrs} ${lib_int_hdrs} ${CMAKE_CURRENT_BINARY_DIR}/generated0.i src/opencv2x.h src/opencv_extra_api.hpp ${generated_hdrs})
|
||||
target_link_libraries(${the_target} ${PYTHON_LIBRARIES} opencv_core opencv_imgproc opencv_video opencv_ml opencv_features2d opencv_highgui opencv_calib3d opencv_objdetect opencv_legacy opencv_contrib)
|
||||
|
||||
set_target_properties(${the_target} PROPERTIES PREFIX "")
|
||||
|
Reference in New Issue
Block a user