From fd095f859adb36988fa1f9904cf8ba420fad0931 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, 3 Aug 2017 09:57:46 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@252
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 cd_utils/CMakeLists.txt | 4 ++--
 qad/QtWraps.cmake       | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cd_utils/CMakeLists.txt b/cd_utils/CMakeLists.txt
index 42f0fa7..673caaf 100644
--- a/cd_utils/CMakeLists.txt
+++ b/cd_utils/CMakeLists.txt
@@ -47,9 +47,9 @@ message(STATUS "Building ${PROJECT_NAME}")
 			install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
-		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
+		#message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
 		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
+		#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 #endif()
diff --git a/qad/QtWraps.cmake b/qad/QtWraps.cmake
index ec97e85..1ae3cd4 100644
--- a/qad/QtWraps.cmake
+++ b/qad/QtWraps.cmake
@@ -92,6 +92,11 @@ macro(find_qt)
 				#message("Qt5: plugins dir: ${Qt5_PLUGINS_DIR}")
 				break()
 			endforeach()
+			if ("x${Qt5_PLUGINS_DIR}" STREQUAL "x")
+				string(FIND "${Qt5_BIN}" "/" _ind REVERSE)
+				string(SUBSTRING "${Qt5_BIN}" 0 ${_ind} _l)
+				set(Qt5_PLUGINS_DIR "${_l}/plugins")
+			endif()
 			if (NOT _QT5_MSG)
 				message(STATUS "Found Qt5: ${_Qt5_qmake} (found version \"${Qt5_VERSION}\")")
 				set(_QT5_MSG 1 CACHE BOOL "msg_qt5" FORCE)