_S happens to be a bad variable name for android

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc1b873..a6955f2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,9 @@ if (NOT CMAKE_INSTALL_PREFIX)
     endif()\r
 endif()\r
 \r
+SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")\r
+SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)\r
+\r
 set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)\r
 set(CMAKE_C_FLAGS_MINSIZEREL "" CACHE INTERNAL "" FORCE)\r
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "" CACHE INTERNAL "" FORCE)\r

diff --git a/modules/features2d/src/evaluation.cpp b/modules/features2d/src/evaluation.cpp
index c2ad098..99a47e9 100644 (file)
--- a/modules/features2d/src/evaluation.cpp
+++ b/modules/features2d/src/evaluation.cpp
@@ -46,6 +46,8 @@
 using namespace cv;
 using namespace std;
 
+//for android ndk
+#undef _S
 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);

diff --git a/modules/python/CMakeLists.txt b/modules/python/CMakeLists.txt
index 973a003..681f8d8 100644 (file)
--- a/modules/python/CMakeLists.txt
+++ b/modules/python/CMakeLists.txt
@@ -57,5 +57,9 @@ if(WIN32)
             ARCHIVE DESTINATION "Python${PYTHON_VERSION_MAJOR_MINOR}/Lib/site-packages" COMPONENT main
             )
 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()

diff --git a/tests/python/test.py b/tests/python/test.py
index 1bd725c..fe6c867 100644 (file)
--- a/tests/python/test.py
+++ b/tests/python/test.py
@@ -1,3 +1,4 @@
+import roslib; roslib.load_manifest('opencv2')
 import unittest
 import random
 import time