Skip to content

Commit

Permalink
Fix android build CMake 3.2 and don't force Python 3 with Qt5
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Feb 16, 2016
1 parent 55727c3 commit 4a27e30
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down

0 comments on commit 4a27e30

Please sign in to comment.