Skip to content

Commit 4a27e30

Browse files
committed
Fix android build CMake 3.2 and don't force Python 3 with Qt5
1 parent 55727c3 commit 4a27e30

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -590,6 +590,7 @@ ENDIF (WIN32)
590590
IF (ANDROID)
591591
SET (DEFAULT_PLUGIN_SUBDIR lib)
592592
SET (DEFAULT_DATA_SUBDIR files/share)
593+
string(REPLACE "<CMAKE_SHARED_LIBRARY_SONAME_CXX_FLAG><TARGET_SONAME>" "" CMAKE_CXX_CREATE_SHARED_MODULE "${CMAKE_CXX_CREATE_SHARED_MODULE}")
593594
ENDIF (ANDROID)
594595

595596
#assume we have escaped compiler directives
@@ -676,9 +677,9 @@ ENDIF (UNIX AND NOT APPLE)
676677
# Python build dependency
677678

678679
IF(ENABLE_QT5)
679-
SET(PYTHON_VER 3)
680+
SET(PYTHON_VER 3 CACHE STRING "Python version")
680681
ELSE(ENABLE_QT5)
681-
SET(PYTHON_VER 2)
682+
SET(PYTHON_VER 2.7 CACHE STRING "Python version")
682683
ENDIF(ENABLE_QT5)
683684

684685
FIND_PACKAGE(PythonInterp ${PYTHON_VER} REQUIRED)

0 commit comments

Comments
 (0)