Fix android build CMake 3.2 and don't force Python 3 with Qt5

m-kuhn · m-kuhn · commit 4a27e3037e89 · 2016-02-16T14:56:33.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -590,6 +590,7 @@ ENDIF (WIN32)
 IF (ANDROID)
     SET (DEFAULT_PLUGIN_SUBDIR  lib)
     SET (DEFAULT_DATA_SUBDIR    files/share)
+    string(REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
 ENDIF (ANDROID)
 
 #assume we have escaped compiler directives
@@ -676,9 +677,9 @@ ENDIF (UNIX AND NOT APPLE)
 # Python build dependency
 
 IF(ENABLE_QT5)
-  SET(PYTHON_VER 3)
+  SET(PYTHON_VER 3 CACHE STRING "Python version")
 ELSE(ENABLE_QT5)
-  SET(PYTHON_VER 2)
+  SET(PYTHON_VER 2.7 CACHE STRING "Python version")
 ENDIF(ENABLE_QT5)
 
 FIND_PACKAGE(PythonInterp ${PYTHON_VER} REQUIRED)
