SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/libs@936 a8b55f48-bf90-11e4-a774-851b48703e85

Browse Source
This commit is contained in:
Пелипенко Иван
2020-04-07 08:55:52 +00:00
parent b39c395482
commit 94123afcd4
3 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
android.toolchain.cmake.add
View File

@@ -1,6 +1,6 @@
set(ANDROID_SYSTEM_LIBRARY_PATH
"${ANDROID_NDK}/platforms/${ANDROID_PLATFORM}/arch-${ANDROID_SYSROOT_ABI}")
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH "${ANDROID_SYSTEM_LIBRARY_PATH}/usr/lib")
include_directories("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include")
set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY FIRST)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE FIRST)
set(CMAKE_PREFIX_PATH /soft/android/${ANDROID_ABI})
list(APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_PREFIX_PATH}/lib)
include_directories(${CMAKE_PREFIX_PATH}/include)

14
cmake_android.sh
View File

@@ -1,11 +1,3 @@
export Qt5_ROOT=/mnt/data/Qt_5.9.1_linux/5.9.1/android_armv7/lib/cmake
export Qt5_DIR=${Qt5_ROOT}/Qt5
export Qt5LinguistTools_DIR=${Qt5_ROOT}/Qt5LinguistTools
export Qt5UiPlugin_DIR=${Qt5_ROOT}/Qt5UiPlugin
export Qt5Widgets_DIR=${Qt5_ROOT}/Qt5Widgets
export Qt5Core_DIR=${Qt5_ROOT}/Qt5Core
export Qt5Gui_DIR=${Qt5_ROOT}/Qt5Gui
export Qt5Sql_DIR=${Qt5_ROOT}/Qt5Sql
export Qt5OpenGL_DIR=${Qt5_ROOT}/Qt5OpenGL
export Qt5Designer_DIR=${Qt5_ROOT}/Qt5Designer
rm -rf * && cmake -Wno-dev -DCMAKE_TOOLCHAIN_FILE=/mnt/data/Distrib/Android/android-sdk-linux/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-24 -DICU=0 -DQt4=0 -DQt5=1 -DQt5_DIR=${Qt5_ROOT}/Qt5 -DQt5LinguistTools_DIR=${Qt5_ROOT}/Qt5LinguistTools -DQt5UiPlugin_DIR=${Qt5_ROOT}/Qt5UiPlugin -DQt5Widgets_DIR=${Qt5_ROOT}/Qt5Widgets -DQt5Core_DIR=${Qt5_ROOT}/Qt5Core -DQt5Gui_DIR=${Qt5_ROOT}/Qt5Gui -DQt5Sql_DIR=${Qt5_ROOT}/Qt5Sql -DQt5OpenGL_DIR=${Qt5_ROOT}/Qt5OpenGL -DQt5Positioning_DIR=${Qt5_ROOT}/Qt5Positioning -DQt5Network_DIR=${Qt5_ROOT}/Qt5Network -DQt5Qml_DIR=${Qt5_ROOT}/Qt5Qml -DQt5Quick_DIR=${Qt5_ROOT}/Qt5Quick -DQt5QuickWidgets_DIR=${Qt5_ROOT}/Qt5QuickWidgets ../libs
export SDK_DIR=/usr/lib/android-sdk
export PREFIX=/soft/android
rm -rf * && cmake -DCMAKE_TOOLCHAIN_FILE=${SDK_DIR}/ndk-bundle/build/cmake/android.toolchain.cmake -DANDROID_PLATFORM=android-21 -DQt4=0 -DQt5=1 -DQt5_DIR=${PREFIX}/qt/lib/cmake/Qt5 ../libs

4
qad/cmake/FindQAD.cmake
View File

@@ -17,6 +17,10 @@ endif()
if(CMAKE_CROSSCOMPILING)
list(APPEND _QAD_INCDIR "${CMAKE_PREFIX_PATH}/include/qad")
list(APPEND _QAD_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
if (DEFINED ANDROID_PLATFORM)
list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/qad)
list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib)
endif()
include_directories(${CMAKE_PREFIX_PATH}/include)
link_directories(${CMAKE_PREFIX_PATH}/lib)
else()