projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16b50fc
)
Fixed target_link_libraries for python bindings
author
Andrey Kamaev
<no@email>
Tue, 12 Jun 2012 16:18:14 +0000
(16:18 +0000)
committer
Andrey Kamaev
<no@email>
Tue, 12 Jun 2012 16:18:14 +0000
(16:18 +0000)
modules/python/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/modules/python/CMakeLists.txt
b/modules/python/CMakeLists.txt
index
461ebca
..
81cf81d
100644
(file)
--- a/
modules/python/CMakeLists.txt
+++ b/
modules/python/CMakeLists.txt
@@
-60,7
+60,7
@@
add_custom_command(
DEPENDS ${opencv_hdrs})
add_library(${the_module} SHARED src2/cv2.cpp ${CMAKE_CURRENT_BINARY_DIR}/generated0.i ${cv2_generated_hdrs} src2/cv2.cv.hpp)
-if(PYTHON_DEBUG_LIBRARIES)
+if(PYTHON_DEBUG_LIBRARIES
AND NOT PYTHON_LIBRARIES MATCHES "optimized.*debug"
)
target_link_libraries(${the_module} debug ${PYTHON_DEBUG_LIBRARIES} optimized ${PYTHON_LIBRARIES})
else()
target_link_libraries(${the_module} ${PYTHON_LIBRARIES})