diff --git a/CMakeLists.txt b/CMakeLists.txt index df75eb9..f03ed6d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -21,6 +21,7 @@ if(MINGW) endif() if (DEFINED ANDROID_PLATFORM) include_directories(${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include) + #set(TARGET_INSTALL_PATH "${ANDROID_SYSTEM_LIBRARY_PATH}/usr/") #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I${ANDROID_NDK}/sysroot/usr/include") #message("${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include") #message("${ANDROID_NDK}/sysroot/usr/include") @@ -49,7 +50,11 @@ if (LIB) if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt index 9104848..f0a0155 100644 --- a/cd_utils/CMakeLists.txt +++ b/cd_utils/CMakeLists.txt @@ -40,7 +40,11 @@ if(LIB) if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/kx_utils/CMakeLists.txt b/kx_utils/CMakeLists.txt index 96bb27e..3af569c 100644 --- a/kx_utils/CMakeLists.txt +++ b/kx_utils/CMakeLists.txt @@ -55,7 +55,11 @@ if (LIB) if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/make_android.bat b/make_android.bat index 809c5c7..516bf49 100644 --- a/make_android.bat +++ b/make_android.bat @@ -10,6 +10,6 @@ set Qt5OpenGL_DIR=%Qt5_ROOT%\Qt5OpenGL set Qt5Designer_DIR=%Qt5_ROOT%\Qt5Designer set Qt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport set Qt5Script_DIR=%Qt5_ROOT%\Qt5Script -cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=d:\Distrib\Android\android-sdk-windows\ndk-bundle\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-24 -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -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 -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs +cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=d:\Distrib\Android\android-sdk-windows\ndk-bundle\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-%~1 -DICU=0 -DQt4=0 -DQt5=1 -DQGLVIEW=0 -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 -DQt5PrintSupport_DIR=%Qt5_ROOT%\Qt5PrintSupport -DQt5Script_DIR=%Qt5_ROOT%\Qt5Script ..\libs :cmake_mgw -Wno-dev -DCMAKE_TOOLCHAIN_FILE=d:\Distrib\Android\android-sdk-windows\ndk-bundle\build\cmake\android.toolchain.cmake -DANDROID_PLATFORM=android-24 -DICU=0 -DQt4=0 -DQt5=1 -DQt5_DIR=%Qt5_ROOT%\Qt5 ..\libs diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt index cef8d8a..e3a9bd1 100644 --- a/piqt/CMakeLists.txt +++ b/piqt/CMakeLists.txt @@ -39,7 +39,11 @@ else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt index 5983043..1849460 100644 --- a/piqt_utils/CMakeLists.txt +++ b/piqt_utils/CMakeLists.txt @@ -59,7 +59,11 @@ else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/piqt_utils/piconnedit/CMakeLists.txt b/piqt_utils/piconnedit/CMakeLists.txt index 337cc52..a8c7770 100644 --- a/piqt_utils/piconnedit/CMakeLists.txt +++ b/piqt_utils/piconnedit/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/piqt_utils/pidumper/CMakeLists.txt b/piqt_utils/pidumper/CMakeLists.txt index 1507744..2cba56e 100644 --- a/piqt_utils/pidumper/CMakeLists.txt +++ b/piqt_utils/pidumper/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/piqt_utils/piintrospector/CMakeLists.txt b/piqt_utils/piintrospector/CMakeLists.txt index 8076bfc..3b2f127 100644 --- a/piqt_utils/piintrospector/CMakeLists.txt +++ b/piqt_utils/piintrospector/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt index 32685fb..c36621e 100644 --- a/qad/CMakeLists.txt +++ b/qad/CMakeLists.txt @@ -27,7 +27,11 @@ if (NOT LIBPROJECT) if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() endif() message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt index d259c1a..5a4f907 100644 --- a/qad/blockview/blockeditor/CMakeLists.txt +++ b/qad/blockview/blockeditor/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qad/graphic/qpicalculator/CMakeLists.txt b/qad/graphic/qpicalculator/CMakeLists.txt index 1ddf336..6cd2148 100644 --- a/qad/graphic/qpicalculator/CMakeLists.txt +++ b/qad/graphic/qpicalculator/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt index a1ed0d0..9ce1c4d 100644 --- a/qcd_utils/CMakeLists.txt +++ b/qcd_utils/CMakeLists.txt @@ -37,7 +37,11 @@ else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) diff --git a/qcd_utils/pult/CMakeLists.txt b/qcd_utils/pult/CMakeLists.txt index ce88833..fe7822a 100644 --- a/qcd_utils/pult/CMakeLists.txt +++ b/qcd_utils/pult/CMakeLists.txt @@ -12,7 +12,11 @@ if(LIB) if(APPLE) qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin) else() - qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + if (DEFINED ANDROID_PLATFORM) + qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/bin) + else() + qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin) + endif() endif() endif() #message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"") diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt index 5c70cbd..43d8436 100644 --- a/qglview/CMakeLists.txt +++ b/qglview/CMakeLists.txt @@ -39,7 +39,11 @@ else() if(APPLE) set(CMAKE_INSTALL_PREFIX /usr/local) else() - set(CMAKE_INSTALL_PREFIX /usr) + if (DEFINED ANDROID_PLATFORM) + set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr) + else() + set(CMAKE_INSTALL_PREFIX /usr) + endif() endif() qt_install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/qad) qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)