Skip to content
Permalink
Browse files

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

  • Loading branch information
m-kuhn committed Feb 16, 2016
1 parent 55727c3 commit 4a27e3037e89c8b8d390e0944e6396fa7c015c51
Showing with 3 additions and 2 deletions.
  1. +3 −2 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)

0 comments on commit 4a27e30

Please sign in to comment.
You can’t perform that action at this time.