From 7826c5ac6fa8005090bb5a01fa3d57284cdfefd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Thu, 5 May 2016 07:44:44 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@91
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 make_libs.bat          | 2 +-
 qglview/CMakeLists.txt | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/make_libs.bat b/make_libs.bat
index 7c65dd4..0de39a6 100644
--- a/make_libs.bat
+++ b/make_libs.bat
@@ -1,7 +1,7 @@
 @echo off
 ::set root=%CD%
 mkdir ..\libs_build_win
-cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8
+cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && cd ../libs
 :: && for %%d in (qad_widgets qad_utils qad_graphic qad_sql_table qad_application touch_widgets qad_blockview %root%) do (
 ::	@if %%d == %root% (
 ::		echo ______ Build Success _______
diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt
index fb41cfb..ae1eae6 100644
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -30,6 +30,8 @@ if (LIB)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
+		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)