games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

[cmake][android] improve fetching ANDROID_SYSROOT_LIB_SUBDIR

Browse Source 
now it uses info from file bundled in the NDK
This commit is contained in:
Andrey Filipenkov
2025-03-09 13:41:27 +03:00
parent 5e2355dde2
commit 951be24f5e
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@@ -626,6 +626,9 @@ elseif(ANDROID)
include(GNUInstallDirs) include(GNUInstallDirs)
set(LIB_DIR "libs/${ANDROID_ABI}") set(LIB_DIR "libs/${ANDROID_ABI}")
file(READ "${CMAKE_ANDROID_NDK}/meta/abis.json" ndkAbiInfo)
string(JSON ANDROID_SYSROOT_LIB_SUBDIR GET "${ndkAbiInfo}" "${ANDROID_ABI}" "triple")
# required by Qt # required by Qt
set(androidPackageSourceDir "${CMAKE_SOURCE_DIR}/android") set(androidPackageSourceDir "${CMAKE_SOURCE_DIR}/android")
set(androidQtBuildDir "${CMAKE_BINARY_DIR}/android-build") set(androidQtBuildDir "${CMAKE_BINARY_DIR}/android-build")

6
conanfile.py
View File

@@ -321,12 +321,6 @@ class VCMI(ConanFile):
tc.variables["CONAN_RUNTIME_LIBS_FILE"] = self._generateRuntimeLibsFile() tc.variables["CONAN_RUNTIME_LIBS_FILE"] = self._generateRuntimeLibsFile()
if self.settings.os == "Android": if self.settings.os == "Android":
tc.variables["CMAKE_ANDROID_API"] = str(self.settings.os.api_level) tc.variables["CMAKE_ANDROID_API"] = str(self.settings.os.api_level)
tc.variables["ANDROID_SYSROOT_LIB_SUBDIR"] = {
"armv7": "arm-linux-androideabi",
"armv8": "aarch64-linux-android",
"x86": "i686-linux-android",
"x86_64": "x86_64-linux-android",
}.get(str(self.settings.arch))
elif self.settings.os == "Windows": elif self.settings.os == "Windows":
tc.variables["CONAN_RUNENV_SCRIPT"] = self._pathForCmake(os.path.join(self.build_folder, "conanrun.bat")) tc.variables["CONAN_RUNENV_SCRIPT"] = self._pathForCmake(os.path.join(self.build_folder, "conanrun.bat"))
tc.generate() tc.generate()