Commit 244a537d authored by Ethan Rublee's avatar Ethan Rublee

_S happens to be a bad variable name for android

parent ef6a7924
...@@ -24,6 +24,9 @@ if (NOT CMAKE_INSTALL_PREFIX) ...@@ -24,6 +24,9 @@ if (NOT CMAKE_INSTALL_PREFIX)
endif() endif()
endif() endif()
SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE) set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
set(CMAKE_C_FLAGS_MINSIZEREL "" CACHE INTERNAL "" FORCE) set(CMAKE_C_FLAGS_MINSIZEREL "" CACHE INTERNAL "" FORCE)
set(CMAKE_C_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "" FORCE) set(CMAKE_C_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "" FORCE)
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
using namespace cv; using namespace cv;
using namespace std; using namespace std;
//for android ndk
#undef _S
static inline Point2f applyHomography( const Mat_<double>& H, const Point2f& pt ) static inline Point2f applyHomography( const Mat_<double>& H, const Point2f& pt )
{ {
double z = H(2,0)*pt.x + H(2,1)*pt.y + H(2,2); double z = H(2,0)*pt.x + H(2,1)*pt.y + H(2,2);
......
...@@ -57,5 +57,9 @@ if(WIN32) ...@@ -57,5 +57,9 @@ if(WIN32)
ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
) )
else() else()
install(FILES ${LIBRARY_OUTPUT_PATH}/cv${CVPY_SUFFIX} DESTINATION ${PYTHON_PACKAGES_PATH}) #install(FILES ${LIBRARY_OUTPUT_PATH}/cv${CVPY_SUFFIX} DESTINATION ${PYTHON_PACKAGES_PATH})
install(TARGETS ${the_target}
RUNTIME DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main
LIBRARY DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main
ARCHIVE DESTINATION ${PYTHON_PACKAGES_PATH} COMPONENT main)
endif() endif()
import roslib; roslib.load_manifest('opencv2')
import unittest import unittest
import random import random
import time import time
......
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