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

2018-04-08 20:31:16 +00:00
parent dbb42c22f5
commit d08606786b
15 changed files with 72 additions and 15 deletions
--- 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")
@@ -48,10 +49,14 @@ if (LIB)
 	else()
 		if(APPLE)
 			set(CMAKE_INSTALL_PREFIX /usr/local)
+		else()
+			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}\"")
 else()
 	message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -39,9 +39,13 @@ if(LIB)
 	else()
 		if(APPLE)
 			set(CMAKE_INSTALL_PREFIX /usr/local)
+		else()
+			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)
 	endif()
--- a/kx_utils/CMakeLists.txt
+++ b/kx_utils/CMakeLists.txt
@@ -54,9 +54,13 @@ if (LIB)
 	else()
 		if(APPLE)
 			set(CMAKE_INSTALL_PREFIX /usr/local)
+		else()
+			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)
 	endif()
--- 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
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -38,9 +38,13 @@ else()
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
+			else()
+				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)
 		endif()
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -58,9 +58,13 @@ else()
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
+			else()
+				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)
 		endif()
--- a/piqt_utils/piconnedit/CMakeLists.txt
+++ b/piqt_utils/piconnedit/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/piqt_utils/pidumper/CMakeLists.txt
+++ b/piqt_utils/pidumper/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/piqt_utils/piintrospector/CMakeLists.txt
+++ b/piqt_utils/piintrospector/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -26,10 +26,14 @@ if (NOT LIBPROJECT)
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
+			else()
+				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}\"")
 	else()
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
--- a/qad/blockview/blockeditor/CMakeLists.txt
+++ b/qad/blockview/blockeditor/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/qad/graphic/qpicalculator/CMakeLists.txt
+++ b/qad/graphic/qpicalculator/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -36,9 +36,13 @@ else()
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
+			else()
+				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)
 		endif()
--- a/qcd_utils/pult/CMakeLists.txt
+++ b/qcd_utils/pult/CMakeLists.txt
@@ -11,10 +11,14 @@ if(LIB)
 	else()
 		if(APPLE)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			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}\"")
 else()
 	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -38,9 +38,13 @@ else()
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
+			else()
+				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)
 		endif()