From f804ec5c830e71eb4d638f1d50a7c32931ac21b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=9F=D0=B5=D0=BB=D0=B8=D0=BF=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=98=D0=B2=D0=B0=D0=BD?= <peri4ko@yandex.ru>
Date: Tue, 23 Apr 2019 09:54:35 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@532
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 CMakeLists.txt            | 20 ++++++++++++++-----
 cd_utils/CMakeLists.txt   | 42 ++++++++++++++++++++++++++-------------
 piqt/CMakeLists.txt       | 14 -------------
 piqt_utils/CMakeLists.txt | 10 ----------
 qcd_utils/CMakeLists.txt  | 10 ----------
 qglview/CMakeLists.txt    |  9 ---------
 6 files changed, 43 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 24f3fb7..eeefdf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,11 @@ if (DEFINED ANDROID_PLATFORM)
 endif()
 set(INSTALL_PREFIX "")
 if(CMAKE_CROSSCOMPILING)
-	set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
+	if (DEFINED ANDROID_PLATFORM)
+		set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
+	else()
+		set(INSTALL_PREFIX "${CMAKE_STAGING_PREFIX}")
+	endif()
 endif()
 option(LIB "System install" 1)
 option(DEBUG "Build with -g3" 0)
@@ -52,9 +56,11 @@ set(PIP_LIBRARY pip)
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io_devices" "io_utils" "console" "math" "code" "geo" "resources" "opencl" "crypt")
 set(PIP_INCLUDES)
 
-if (LIB)
+if(LIB)
 	if(WIN32)
-		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
+		if(MINGW)
+			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
+		endif()
 	else()
 		if(APPLE)
 			set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
@@ -62,7 +68,11 @@ if (LIB)
 			if (DEFINED ANDROID_PLATFORM)
 				set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
 			else()
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
+				if(CMAKE_CROSSCOMPILING)
+					set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
+				else()
+					set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
+				endif()
 			endif()
 		endif()
 	endif()
@@ -75,7 +85,7 @@ foreach(F ${PIP_FOLDERS})
 	list(APPEND PIP_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/pip/src_main/${F}")
 endforeach(F)
 #message(${PIP_INCLUDES})
-if(DEFINED ANDROID_PLATFORM)
+if(CMAKE_CROSSCOMPILING OR (DEFINED ANDROID_PLATFORM))
 	set(PIP_CMG "pip_cmg")
 	set(PIP_RC "pip_rc")
 else()
diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt
index eb75472..01f9881 100644
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -29,27 +29,41 @@ target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
 
 add_executable(cdutilstest "cdutilstest.cpp" "cdtest.h")
 target_link_libraries(cdutilstest ${PIP_LIBRARY} ${PROJECT_NAME})
-set(INSTALL_PREFIX "")
-if(CMAKE_CROSSCOMPILING)
-	set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
-endif()
 message(STATUS "Building ${PROJECT_NAME}")
+
+if(NOT LIBPROJECT)
+	if(LIB)
+		if(WIN32)
+			if(MINGW)
+				set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
+			endif()
+		else()
+			if(APPLE)
+				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
+			else()
+				if (DEFINED ANDROID_PLATFORM)
+					set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
+				else()
+					if(CMAKE_CROSSCOMPILING)
+						set(CMAKE_INSTALL_PREFIX ${CMAKE_STAGING_PREFIX})
+					else()
+						set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
+					endif()
+				endif()
+			endif()
+		endif()
+		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+	else()
+		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+	endif()
+endif()
+
 if(LIB)
 	if(WIN32)
-		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
-		if(APPLE)
-			set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
-		else()
-			if (DEFINED ANDROID_PLATFORM)
-				set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
-			else()
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr)
-			endif()
-		endif()
 		install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif()
diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt
index 8a91724..ec9888b 100644
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -22,16 +22,11 @@ qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 qt_add_library(${PROJECT_NAME} SHARED out_CPP)
 qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets)
 message(STATUS "Building ${PROJECT_NAME}")
-set(INSTALL_PREFIX "")
-if(CMAKE_CROSSCOMPILING)
-	set(INSTALL_PREFIX "${CMAKE_FIND_ROOT_PATH}/")
-endif()
 if(LIBPROJECT)
 	sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")
 else()
 	if(LIB)
 		if(WIN32)
-			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
 			if(NOT "x${out_QM}" STREQUAL "x")
 				qt_install(FILES ${out_QM} DESTINATION QtLang)
@@ -40,15 +35,6 @@ else()
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
-			if(APPLE)
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}/usr/local)
-			else()
-				if (DEFINED ANDROID_PLATFORM)
-					set(CMAKE_INSTALL_PREFIX {ANDROID_SYSTEM_LIBRARY_PATH}/usr)
-				else()
-					set(CMAKE_INSTALL_PREFIX ${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()
diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index 0b9ffab..c1a7c3c 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -54,21 +54,11 @@ if(LIBPROJECT)
 else()
 	if(LIB)
 		if(WIN32)
-			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
-			if(APPLE)
-				set(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX}$/usr/local)
-			else()
-				if (DEFINED ANDROID_PLATFORM)
-					set(CMAKE_INSTALL_PREFIX ${ANDROID_SYSTEM_LIBRARY_PATH}/usr)
-				else()
-					set(CMAKE_INSTALL_PREFIX ${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()
diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt
index 8487fb5..c9d3fba 100644
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -30,21 +30,11 @@ if(LIBPROJECT)
 else()
 	if(LIB)
 		if(WIN32)
-			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		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()
diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt
index 43d8436..ef7e07b 100644
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -36,15 +36,6 @@ else()
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		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()