From 27854e9f3fe81a89f8876b9702d1d91e599c94fb 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: Thu, 19 Mar 2020 10:42:24 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@865
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 SDKMacros.cmake                  | 8 ++++++--
 cd_utils/CMakeLists.txt          | 8 ++++++--
 piqt/CMakeLists.txt              | 8 ++++++--
 piqt_utils/CMakeLists.txt        | 8 ++++++--
 qad/CMakeLists.txt               | 8 ++++++--
 qcd_utils/CMakeLists.txt         | 8 ++++++--
 qglengine/CMakeLists.txt         | 8 ++++++--
 qglengine/widgets/CMakeLists.txt | 7 ++++++-
 qglview/CMakeLists.txt           | 8 ++++++--
 9 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/SDKMacros.cmake b/SDKMacros.cmake
index ce31649..4237e58 100644
--- a/SDKMacros.cmake
+++ b/SDKMacros.cmake
@@ -22,8 +22,12 @@ macro(sdk_install _DIR _TARGET _H_FILES _QM_FILES)
 		if(NOT "x${_H_FILES}" STREQUAL "x")
 			install(FILES ${_H_FILES} DESTINATION include/${_DIR})
 		endif()
-		qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
-		qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${_TARGET} DESTINATION bin/lib)
+		endif()
 		if(NOT "x${_QM_FILES}" STREQUAL "x")
 			qt_install(LANG ${_QM_FILES} DESTINATION lang)
 		endif()
diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt
index 6424091..6d2a3b3 100644
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -78,8 +78,12 @@ if(LIB)
 	endif()
 	#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 else()
-	install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-	install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+	if(WIN32)
+		install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+		install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+	else()
+		install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+	endif()
 	install(FILES ${HDRS_UTILS} DESTINATION include)
 	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt
index 4f5fcd8..b50587b 100644
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -40,8 +40,12 @@ else()
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-		qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+		endif()
 		install(FILES ${out_HDR} DESTINATION include/pip)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 	endif()
diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index 10d2789..4a46907 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -64,8 +64,12 @@ else()
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-		qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+		endif()
 		install(FILES ${out_HDR} DESTINATION include/pip)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 	endif()
diff --git a/qad/CMakeLists.txt b/qad/CMakeLists.txt
index f5105f9..fb1f52f 100644
--- a/qad/CMakeLists.txt
+++ b/qad/CMakeLists.txt
@@ -86,8 +86,12 @@ macro(qad_install _TARGET _H_FILES _QM_FILES)
 				qt_install(LANG ${_QM_FILES} DESTINATION QtLang)
 			endif()
 		else()
-			qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
-			qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
+			if(WIN32)
+				qt_install(TARGETS ${_TARGET} RUNTIME DESTINATION bin)
+				qt_install(TARGETS ${_TARGET} ARCHIVE DESTINATION lib)
+			else()
+				qt_install(TARGETS ${_TARGET} DESTINATION bin/lib)
+			endif()
 			if(NOT "x${_H_FILES}" STREQUAL "x")
 				install(FILES ${_H_FILES} DESTINATION include/qad)
 			endif()
diff --git a/qcd_utils/CMakeLists.txt b/qcd_utils/CMakeLists.txt
index 45fb33b..971b170 100644
--- a/qcd_utils/CMakeLists.txt
+++ b/qcd_utils/CMakeLists.txt
@@ -40,8 +40,12 @@ else()
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-		qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+		endif()
 		install(FILES ${out_HDR} DESTINATION include)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 	endif()
diff --git a/qglengine/CMakeLists.txt b/qglengine/CMakeLists.txt
index cbf1999..0367fef 100644
--- a/qglengine/CMakeLists.txt
+++ b/qglengine/CMakeLists.txt
@@ -54,8 +54,12 @@ else()
 		endif()
 		message(STATUS "Install qglengine_core to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin)
-		qt_install(TARGETS qglengine_core ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS qglengine_core RUNTIME DESTINATION bin)
+			qt_install(TARGETS qglengine_core ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS qglengine_core DESTINATION bin/lib)
+		endif()
 		qt_install(FILES ${out_HDR} DESTINATION include/qglengine)
 		message(STATUS "Install qglengine_core to local \"bin\", \"lib\" and \"include\"")
 	endif()
diff --git a/qglengine/widgets/CMakeLists.txt b/qglengine/widgets/CMakeLists.txt
index 3ac07f5..b50dd52 100644
--- a/qglengine/widgets/CMakeLists.txt
+++ b/qglengine/widgets/CMakeLists.txt
@@ -28,7 +28,12 @@ else()
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+		if(WIN32)
+			qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+		endif()
 		qt_install(TARGETS ${PROJECT_NAME} DESTINATION lib)
 		qt_install(FILES ${H} DESTINATION include/qglengine)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt
index 82e45d6..d429bb1 100644
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -41,8 +41,12 @@ else()
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
-		qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		if(WIN32)
+			qt_install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+			qt_install(TARGETS ${PROJECT_NAME} ARCHIVE DESTINATION lib)
+		else()
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin/lib)
+		endif()
 		qt_install(FILES ${H} DESTINATION include/qad)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\", \"lib\" and \"include\"")
 	endif()