sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Matthias Kuhn 2016-02-16 14:54:25 +01:00
parent 55727c3fcf
commit 4a27e3037e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -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)