From 4a3c8292f1b733ef62121cabe51c934e5cc8524d 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: Sat, 16 Apr 2016 17:35:03 +0000
Subject: [PATCH] new cmake build

git-svn-id: svn://db.shs.com.ru/libs@90 a8b55f48-bf90-11e4-a774-851b48703e85
---
 CMakeLists.txt                                | 15 ++----
 kx_utils/CMakeLists.txt                       | 50 +++++++++----------
 kx_utils/make_lib.bat                         |  2 +-
 make_libs.bat                                 | 19 +++----
 make_libs.sh                                  | 22 ++++----
 mbricks/CMakeLists.txt                        | 29 ++++++-----
 mbricks/make_lib.bat                          |  2 +-
 piqt/CMakeLists.txt                           | 12 +++--
 piqt/make_lib.bat                             |  2 +-
 piqt_utils/CMakeLists.txt                     | 50 +++++++++----------
 piqt_utils/make_lib.bat                       |  2 +-
 qad_application/CMakeLists.txt                | 40 ++++++++-------
 qad_application/make_lib.bat                  |  2 +-
 qad_application/plugin/CMakeLists.txt         | 20 ++++++++
 .../{ => plugin}/edockwidgetplugin.cpp        |  0
 .../{ => plugin}/edockwidgetplugin.h          |  0
 .../{ => plugin}/emainwindowplugin.cpp        |  0
 .../{ => plugin}/emainwindowplugin.h          |  0
 .../{ => plugin}/historyviewplugin.cpp        |  0
 .../{ => plugin}/historyviewplugin.h          |  0
 .../{ => plugin}/qad_application.cpp          |  0
 .../{ => plugin}/qad_application.h            |  0
 qad_application/qad_application.pro           | 16 ------
 qad_blockview/CMakeLists.txt                  | 39 ++++++++-------
 qad_blockview/make_lib.bat                    |  2 +-
 qad_blockview/plugin/CMakeLists.txt           | 20 ++++++++
 .../{ => plugin}/blockviewplugin.cpp          |  0
 qad_blockview/{ => plugin}/blockviewplugin.h  |  0
 qad_blockview/{ => plugin}/qad_blockview.cpp  |  0
 qad_blockview/{ => plugin}/qad_blockview.h    |  0
 qad_blockview/qad_blockview.pro               | 16 ------
 qad_graphic/CMakeLists.txt                    | 44 ++++++++--------
 qad_graphic/make_lib.bat                      |  2 +-
 qad_graphic/plugin/CMakeLists.txt             | 21 ++++++++
 qad_graphic/{ => plugin}/graphicplugin.cpp    |  2 +-
 qad_graphic/{ => plugin}/graphicplugin.h      |  0
 qad_graphic/{ => plugin}/qad_graphic.cpp      |  0
 qad_graphic/{ => plugin}/qad_graphic.h        |  0
 qad_graphic/qad_graphic.pro                   | 16 ------
 qad_sql_table/CMakeLists.txt                  | 39 ++++++++-------
 qad_sql_table/make_lib.bat                    |  2 +-
 qad_sql_table/plugin/CMakeLists.txt           | 20 ++++++++
 qad_sql_table/{ => plugin}/qad_sql_table.cpp  |  0
 qad_sql_table/{ => plugin}/qad_sql_table.h    |  0
 .../{ => plugin}/sql_record_plugin.cpp        |  0
 .../{ => plugin}/sql_record_plugin.h          |  0
 .../{ => plugin}/sql_table_plugin.cpp         |  0
 qad_sql_table/{ => plugin}/sql_table_plugin.h |  0
 qad_sql_table/qad_sql_table.pro               | 17 -------
 qad_utils/CMakeLists.txt                      | 43 ++++++++--------
 qad_utils/make_lib.bat                        |  2 +-
 qad_utils/plugin/CMakeLists.txt               | 20 ++++++++
 qad_utils/{ => plugin}/qad_utils.cpp          |  0
 qad_utils/{ => plugin}/qad_utils.h            |  0
 qad_utils/{ => plugin}/qpiconfigplugin.cpp    |  0
 qad_utils/{ => plugin}/qpiconfigplugin.h      |  0
 qad_utils/qad_utils.pro                       | 16 ------
 qad_utils/qpiconfigwidget.pri                 |  8 ---
 qad_widgets/CMakeLists.txt                    | 46 ++++++++---------
 qad_widgets/make_lib.bat                      |  2 +-
 qad_widgets/plugin/CMakeLists.txt             | 20 ++++++++
 qad_widgets/{ => plugin}/chardialogplugin.cpp |  0
 qad_widgets/{ => plugin}/chardialogplugin.h   |  0
 qad_widgets/{ => plugin}/clineeditplugin.cpp  |  0
 qad_widgets/{ => plugin}/clineeditplugin.h    |  0
 .../{ => plugin}/colorbuttonplugin.cpp        |  0
 qad_widgets/{ => plugin}/colorbuttonplugin.h  |  0
 qad_widgets/{ => plugin}/ecomboboxplugin.cpp  |  0
 qad_widgets/{ => plugin}/ecomboboxplugin.h    |  0
 qad_widgets/{ => plugin}/iconedlabelplugin.h  |  0
 .../{ => plugin}/lconedlabelplugin.cpp        |  0
 qad_widgets/{ => plugin}/qad_widgets.cpp      |  0
 qad_widgets/{ => plugin}/qad_widgets.h        |  0
 qad_widgets/{ => plugin}/qcodeeditplugin.cpp  |  0
 qad_widgets/{ => plugin}/qcodeeditplugin.h    |  0
 qad_widgets/{ => plugin}/qipeditplugin.cpp    |  0
 qad_widgets/{ => plugin}/qipeditplugin.h      |  0
 qad_widgets/{ => plugin}/qpiconsoleplugin.cpp |  0
 qad_widgets/{ => plugin}/qpiconsoleplugin.h   |  0
 qad_widgets/{ => plugin}/qpointeditplugin.cpp |  0
 qad_widgets/{ => plugin}/qpointeditplugin.h   |  0
 qad_widgets/{ => plugin}/qrecteditplugin.cpp  |  0
 qad_widgets/{ => plugin}/qrecteditplugin.h    |  0
 .../{ => plugin}/qvarianteditplugin.cpp       |  0
 qad_widgets/{ => plugin}/qvarianteditplugin.h |  0
 qad_widgets/{ => plugin}/shortcutsplugin.cpp  |  0
 qad_widgets/{ => plugin}/shortcutsplugin.h    |  0
 qad_widgets/{ => plugin}/spinsliderplugin.cpp |  0
 qad_widgets/{ => plugin}/spinsliderplugin.h   |  0
 qad_widgets/qad_widgets.pro                   | 28 -----------
 qglview/CMakeLists.txt                        | 41 +++++++--------
 qglview/make_lib.bat                          |  2 +-
 touch_widgets/CMakeLists.txt                  | 41 ++++++++-------
 touch_widgets/make_lib.bat                    |  2 +-
 touch_widgets/plugin/CMakeLists.txt           | 20 ++++++++
 .../{tw.cpp => plugin/touch_widgets.cpp}      |  2 +-
 .../{tw.h => plugin/touch_widgets.h}          |  0
 .../{ => plugin}/touchbuttframeplugin.cpp     |  0
 .../{ => plugin}/touchbuttframeplugin.h       |  0
 .../{ => plugin}/touchbuttonplugin.cpp        |  0
 .../{ => plugin}/touchbuttonplugin.h          |  0
 .../{ => plugin}/touchsliderplugin.cpp        |  0
 .../{ => plugin}/touchsliderplugin.h          |  0
 touch_widgets/touch_widgets.pro               | 14 ------
 104 files changed, 436 insertions(+), 394 deletions(-)
 create mode 100644 qad_application/plugin/CMakeLists.txt
 rename qad_application/{ => plugin}/edockwidgetplugin.cpp (100%)
 rename qad_application/{ => plugin}/edockwidgetplugin.h (100%)
 rename qad_application/{ => plugin}/emainwindowplugin.cpp (100%)
 rename qad_application/{ => plugin}/emainwindowplugin.h (100%)
 rename qad_application/{ => plugin}/historyviewplugin.cpp (100%)
 rename qad_application/{ => plugin}/historyviewplugin.h (100%)
 rename qad_application/{ => plugin}/qad_application.cpp (100%)
 rename qad_application/{ => plugin}/qad_application.h (100%)
 delete mode 100644 qad_application/qad_application.pro
 create mode 100644 qad_blockview/plugin/CMakeLists.txt
 rename qad_blockview/{ => plugin}/blockviewplugin.cpp (100%)
 rename qad_blockview/{ => plugin}/blockviewplugin.h (100%)
 rename qad_blockview/{ => plugin}/qad_blockview.cpp (100%)
 rename qad_blockview/{ => plugin}/qad_blockview.h (100%)
 delete mode 100644 qad_blockview/qad_blockview.pro
 create mode 100644 qad_graphic/plugin/CMakeLists.txt
 rename qad_graphic/{ => plugin}/graphicplugin.cpp (91%)
 rename qad_graphic/{ => plugin}/graphicplugin.h (100%)
 rename qad_graphic/{ => plugin}/qad_graphic.cpp (100%)
 rename qad_graphic/{ => plugin}/qad_graphic.h (100%)
 delete mode 100644 qad_graphic/qad_graphic.pro
 create mode 100644 qad_sql_table/plugin/CMakeLists.txt
 rename qad_sql_table/{ => plugin}/qad_sql_table.cpp (100%)
 rename qad_sql_table/{ => plugin}/qad_sql_table.h (100%)
 rename qad_sql_table/{ => plugin}/sql_record_plugin.cpp (100%)
 rename qad_sql_table/{ => plugin}/sql_record_plugin.h (100%)
 rename qad_sql_table/{ => plugin}/sql_table_plugin.cpp (100%)
 rename qad_sql_table/{ => plugin}/sql_table_plugin.h (100%)
 delete mode 100644 qad_sql_table/qad_sql_table.pro
 create mode 100644 qad_utils/plugin/CMakeLists.txt
 rename qad_utils/{ => plugin}/qad_utils.cpp (100%)
 rename qad_utils/{ => plugin}/qad_utils.h (100%)
 rename qad_utils/{ => plugin}/qpiconfigplugin.cpp (100%)
 rename qad_utils/{ => plugin}/qpiconfigplugin.h (100%)
 delete mode 100644 qad_utils/qad_utils.pro
 delete mode 100644 qad_utils/qpiconfigwidget.pri
 create mode 100644 qad_widgets/plugin/CMakeLists.txt
 rename qad_widgets/{ => plugin}/chardialogplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/chardialogplugin.h (100%)
 rename qad_widgets/{ => plugin}/clineeditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/clineeditplugin.h (100%)
 rename qad_widgets/{ => plugin}/colorbuttonplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/colorbuttonplugin.h (100%)
 rename qad_widgets/{ => plugin}/ecomboboxplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/ecomboboxplugin.h (100%)
 rename qad_widgets/{ => plugin}/iconedlabelplugin.h (100%)
 rename qad_widgets/{ => plugin}/lconedlabelplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qad_widgets.cpp (100%)
 rename qad_widgets/{ => plugin}/qad_widgets.h (100%)
 rename qad_widgets/{ => plugin}/qcodeeditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qcodeeditplugin.h (100%)
 rename qad_widgets/{ => plugin}/qipeditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qipeditplugin.h (100%)
 rename qad_widgets/{ => plugin}/qpiconsoleplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qpiconsoleplugin.h (100%)
 rename qad_widgets/{ => plugin}/qpointeditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qpointeditplugin.h (100%)
 rename qad_widgets/{ => plugin}/qrecteditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qrecteditplugin.h (100%)
 rename qad_widgets/{ => plugin}/qvarianteditplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/qvarianteditplugin.h (100%)
 rename qad_widgets/{ => plugin}/shortcutsplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/shortcutsplugin.h (100%)
 rename qad_widgets/{ => plugin}/spinsliderplugin.cpp (100%)
 rename qad_widgets/{ => plugin}/spinsliderplugin.h (100%)
 delete mode 100644 qad_widgets/qad_widgets.pro
 create mode 100644 touch_widgets/plugin/CMakeLists.txt
 rename touch_widgets/{tw.cpp => plugin/touch_widgets.cpp} (94%)
 rename touch_widgets/{tw.h => plugin/touch_widgets.h} (100%)
 rename touch_widgets/{ => plugin}/touchbuttframeplugin.cpp (100%)
 rename touch_widgets/{ => plugin}/touchbuttframeplugin.h (100%)
 rename touch_widgets/{ => plugin}/touchbuttonplugin.cpp (100%)
 rename touch_widgets/{ => plugin}/touchbuttonplugin.h (100%)
 rename touch_widgets/{ => plugin}/touchsliderplugin.cpp (100%)
 rename touch_widgets/{ => plugin}/touchsliderplugin.h (100%)
 delete mode 100644 touch_widgets/touch_widgets.pro

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5932874..b1723be 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,10 +1,8 @@
 cmake_minimum_required(VERSION 2.6)
 project(libs)
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-if (${WIN32})
+if (MINGW)
 	find_package(MinGW REQUIRED)
-endif (${WIN32})
-#find_package(Qt REQUIRED)
+endif ()
 set(LIB 1)
 set(USB 1)
 set(ICU 1)
@@ -12,21 +10,16 @@ set(CRYPT 1)
 set(LIBPROJECT 1)
 set(PIP_LIBRARY pip)
 set(PIP_FOLDERS "." "core" "containers" "thread" "system" "io" "console" "math" "code")
-
 foreach(F ${PIP_FOLDERS})
 	set(PIP_INCLUDES ${PIP_INCLUDES} "../pip/src/${F}")
 endforeach(F)
-#message(STATUS "PIP includes = ${PIP_INCLUDES}")
-
 set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt mbricks kx_utils piqt_utils touch_widgets qglview)
-
 foreach(L ${LIST_LIBS})
 	add_subdirectory(${L})
 	include_directories(${L})
 endforeach(L)
-
-if (${WIN32})
+if (WIN32)
 	get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/pip/libpip.dll" DESTINATION ${QTDIR})
 	install(FILES "FindMinGW.cmake" DESTINATION ${CMAKE_ROOT}/Modules)
-endif (${WIN32})
+endif ()
diff --git a/kx_utils/CMakeLists.txt b/kx_utils/CMakeLists.txt
index 1473737..8479a03 100644
--- a/kx_utils/CMakeLists.txt
+++ b/kx_utils/CMakeLists.txt
@@ -3,26 +3,30 @@ cmake_minimum_required(VERSION 2.6)
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 endif ()
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES})
-
-option(KX_PULT "Build kx_pult" 1)
-
+set(KX_PULT_NAME "kx_pult")
+option(KX_PULT "Build ${KX_PULT_NAME}" 1)
+option(LIB "System install" 1)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
 set(CPPS_UTILS "kx_coeffs.cpp")
 set(HDRS_UTILS "kx_coeffs.h" "kx_protocol_x.h")
 if (DEFINED ENV{QNX_HOST})
-	add_library(kx_utils STATIC ${CPPS_UTILS})
+	add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS})
 else ()
-	add_library(kx_utils SHARED ${CPPS_UTILS})
+	add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS})
 endif ()
-target_link_libraries(kx_utils ${PIP_LIBRARY})
-
+target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
 if (NOT DEFINED ENV{QNX_HOST})
 	if (KX_PULT)
 		find_package(Qt4 REQUIRED)
+		find_package(OpenGL REQUIRED)
 		include_directories(${QT_INCLUDES})
 		set(CPPS "kx_pult.cpp" "kx_pult.h" "kx_pult.ui" "main_kx_pult.cpp")
 		set(MOCS "kx_pult.h")
@@ -31,32 +35,28 @@ if (NOT DEFINED ENV{QNX_HOST})
 		qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 		qt4_wrap_ui(CUIS ${UIS})
 		qt4_add_resources(RESS ${RES})
-		add_executable(kx_pult WIN32 ${CPPS} ${CMOCS} ${CUIS} ${RESS})
-		set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets kx_utils)
-		find_package(OpenGL REQUIRED)
-		list(APPEND LIBS ${OPENGL_LIBRARIES})
-		target_link_libraries(kx_pult ${LIBS})
+		add_executable(${KX_PULT_NAME} WIN32 ${CPPS} ${CMOCS} ${CUIS} ${RESS} ${MOCS})
+		set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ${PIP_LIBRARY} qad_graphic qad_utils qad_widgets)
+		target_link_libraries(${KX_PULT_NAME} ${LIBS} ${PROJECT_NAME})
 	endif ()
 endif ()
-
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS kx_utils DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS kx_utils DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS kx_utils DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
-
 if (NOT DEFINED ENV{QNX_HOST})
 	if (KX_PULT)
-		install(TARGETS kx_pult DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
+		install(TARGETS ${KX_PULT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 	endif ()
 endif ()
diff --git a/kx_utils/make_lib.bat b/kx_utils/make_lib.bat
index afe1db5..0148a43 100644
--- a/kx_utils/make_lib.bat
+++ b/kx_utils/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install %*
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/make_libs.bat b/make_libs.bat
index d35d5a1..7c65dd4 100644
--- a/make_libs.bat
+++ b/make_libs.bat
@@ -1,11 +1,12 @@
 @echo off
-set root=%CD%
+::set root=%CD%
 mkdir ..\libs_build_win
-cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && 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 _______
-		cd %%d
-	) else (
-		cd %%d && qmake ../../libs/%%d && make install -j8 && cd ..
-	)
-)
+cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8
+:: && 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 _______
+::		cd %%d
+::	) else (
+::		cd %%d && qmake ../../libs/%%d && make install -j8 && cd ..
+::	)
+::)
diff --git a/make_libs.sh b/make_libs.sh
index 998cd15..b831a40 100755
--- a/make_libs.sh
+++ b/make_libs.sh
@@ -1,9 +1,13 @@
-#cmake .
-#make install $@
-for d in 'qad_widgets' 'qad_utils' 'qad_graphic' 'qad_sql_table' 'qad_application' 'qad_blockview' 'touch_widgets'; do
-	cd $d
-	echo "now in $(pwd -P)"
-	qmake
-	make install $@
-	cd ..
-done
+#! /bin/bash
+cd ..
+mkdir libs_build_linux
+cd libs_build_linux
+cmake ../libs
+make install $@
+#for d in 'qad_widgets' 'qad_utils' 'qad_graphic' 'qad_sql_table' 'qad_application' 'qad_blockview' 'touch_widgets'; do
+#	cd $d
+#	echo "now in $(pwd -P)"
+#	qmake
+#	make install $@
+#	cd ..
+#done
diff --git a/mbricks/CMakeLists.txt b/mbricks/CMakeLists.txt
index 45db234..866ffbd 100644
--- a/mbricks/CMakeLists.txt
+++ b/mbricks/CMakeLists.txt
@@ -3,27 +3,32 @@ cmake_minimum_required(VERSION 2.6)
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 endif ()
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES})
+option(LIB "System install" 1)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
 file(GLOB HDRS "*.h")
 file(GLOB CPPS "*.cpp")
-add_library(mbricks SHARED ${CPPS})
-target_link_libraries(mbricks ${PIP_LIBRARY})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS})
+target_link_libraries(${PROJECT_NAME} ${PIP_LIBRARY})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${HDRS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS mbricks DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS mbricks DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS mbricks DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
diff --git a/mbricks/make_lib.bat b/mbricks/make_lib.bat
index afe1db5..0148a43 100644
--- a/mbricks/make_lib.bat
+++ b/mbricks/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install %*
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/piqt/CMakeLists.txt b/piqt/CMakeLists.txt
index 48d7d74..041aaf7 100644
--- a/piqt/CMakeLists.txt
+++ b/piqt/CMakeLists.txt
@@ -1,13 +1,17 @@
 project(piqt)
 cmake_minimum_required(VERSION 2.6)
+option(LIB "System install" 0)
 file(GLOB HDRS "./*.h")
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+if (LIB)
+	if (WIN32)
+		if (MINGW)
+			find_package(MinGW REQUIRED)
+		endif()
+		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${HDRS} DESTINATION ${MINGW_INCLUDE})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${HDRS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 endif ()
diff --git a/piqt/make_lib.bat b/piqt/make_lib.bat
index afe1db5..0148a43 100644
--- a/piqt/make_lib.bat
+++ b/piqt/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install %*
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index 4506361..589b097 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -1,27 +1,31 @@
 project(piqt_utils)
 cmake_minimum_required(VERSION 2.6)
-if (NOT ${LIBPROJECT})
+find_package(Qt4 REQUIRED)
+if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 endif ()
-find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PIP_INCLUDES} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview)
 file(GLOB CPPS_UTILS "piqt_*.cpp" "ccm.cpp")
 file(GLOB HDRS_UTILS "piqt_*.h")
 file(GLOB UIS_UTILS "piqt_*.ui")
 qt4_wrap_cpp(CMOCS_UTILS ${HDRS_UTILS} OPTIONS -nw)
 qt4_wrap_ui(CUIS_UTILS ${UIS_UTILS})
 if (DEFINED ENV{QNX_HOST})
-	add_library(piqt_utils STATIC ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS})
+	add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS})
 else ()
-	add_library(piqt_utils SHARED ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS})
+	add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS})
 endif ()
-target_link_libraries(piqt_utils ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_utils qad_widgets qad_blockview)
-
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 if (NOT DEFINED ENV{QNX_HOST})
 	set(CPPS "pidumper.cpp" "pidumper_main.cpp")
 	set(MOCS "pidumper.h")
@@ -31,8 +35,7 @@ if (NOT DEFINED ENV{QNX_HOST})
 	qt4_wrap_ui(CUIS ${UIS})
 	qt4_add_resources(RESS ${RES})
 	add_executable(pidumper ${CPPS} ${CMOCS} ${CUIS} ${RESS})
-	set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets piqt_utils)
-	target_link_libraries(pidumper ${LIBS})
+	target_link_libraries(pidumper ${LIBS} ${PROJECT_NAME})
 
 	set(ICPPS "piintrospector.cpp" "piintrospector_main.cpp")
 	set(IMOCS "piintrospector.h")
@@ -42,31 +45,28 @@ if (NOT DEFINED ENV{QNX_HOST})
 	qt4_wrap_ui(ICUIS ${IUIS})
 	qt4_add_resources(IRESS ${IRES})
 	add_executable(piintrospector ${ICPPS} ${ICMOCS} ${ICUIS} ${IRESS})
-	set(ILIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets)
-	target_link_libraries(piintrospector ${LIBS})
+	target_link_libraries(piintrospector ${LIBS} ${PROJECT_NAME})
 
 	add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})
-	target_link_libraries(piconnectionedit ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} piqt_utils)
+	target_link_libraries(piconnectionedit ${LIBS} ${PROJECT_NAME})
 endif ()
-
-if (DEFINED LIB)
-	set(LIB true)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS piqt_utils DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS piqt_utils DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS piqt_utils DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS piqt_utils DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
-
 if (NOT DEFINED ENV{QNX_HOST})
 	install(TARGETS pidumper DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 	install(TARGETS piconnectionedit DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
diff --git a/piqt_utils/make_lib.bat b/piqt_utils/make_lib.bat
index afe1db5..0148a43 100644
--- a/piqt_utils/make_lib.bat
+++ b/piqt_utils/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install %*
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_application/CMakeLists.txt b/qad_application/CMakeLists.txt
index 2de2bb8..c7ce1a4 100644
--- a/qad_application/CMakeLists.txt
+++ b/qad_application/CMakeLists.txt
@@ -1,36 +1,42 @@
 project(qad_application)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "emainwindow.h"   "edockwidget.h"   "etabwidget.h"   "ribbon.h"   "historyview.h"   "qsingleapplication.h")
-set(CPPS "emainwindow.cpp" "edockwidget.cpp" "etabwidget.cpp" "ribbon.cpp" "historyview.cpp" "qsingleapplication.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_application SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_utils)
-target_link_libraries(qad_application ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_application DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_application DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_application DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_application DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
+
diff --git a/qad_application/make_lib.bat b/qad_application/make_lib.bat
index 871dab0..0148a43 100644
--- a/qad_application/make_lib.bat
+++ b/qad_application/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install %* && qmake && make install %*
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_application/plugin/CMakeLists.txt b/qad_application/plugin/CMakeLists.txt
new file mode 100644
index 0000000..4ff95ef
--- /dev/null
+++ b/qad_application/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(qad_application_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_application)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_application/edockwidgetplugin.cpp b/qad_application/plugin/edockwidgetplugin.cpp
similarity index 100%
rename from qad_application/edockwidgetplugin.cpp
rename to qad_application/plugin/edockwidgetplugin.cpp
diff --git a/qad_application/edockwidgetplugin.h b/qad_application/plugin/edockwidgetplugin.h
similarity index 100%
rename from qad_application/edockwidgetplugin.h
rename to qad_application/plugin/edockwidgetplugin.h
diff --git a/qad_application/emainwindowplugin.cpp b/qad_application/plugin/emainwindowplugin.cpp
similarity index 100%
rename from qad_application/emainwindowplugin.cpp
rename to qad_application/plugin/emainwindowplugin.cpp
diff --git a/qad_application/emainwindowplugin.h b/qad_application/plugin/emainwindowplugin.h
similarity index 100%
rename from qad_application/emainwindowplugin.h
rename to qad_application/plugin/emainwindowplugin.h
diff --git a/qad_application/historyviewplugin.cpp b/qad_application/plugin/historyviewplugin.cpp
similarity index 100%
rename from qad_application/historyviewplugin.cpp
rename to qad_application/plugin/historyviewplugin.cpp
diff --git a/qad_application/historyviewplugin.h b/qad_application/plugin/historyviewplugin.h
similarity index 100%
rename from qad_application/historyviewplugin.h
rename to qad_application/plugin/historyviewplugin.h
diff --git a/qad_application/qad_application.cpp b/qad_application/plugin/qad_application.cpp
similarity index 100%
rename from qad_application/qad_application.cpp
rename to qad_application/plugin/qad_application.cpp
diff --git a/qad_application/qad_application.h b/qad_application/plugin/qad_application.h
similarity index 100%
rename from qad_application/qad_application.h
rename to qad_application/plugin/qad_application.h
diff --git a/qad_application/qad_application.pro b/qad_application/qad_application.pro
deleted file mode 100644
index 612bf14..0000000
--- a/qad_application/qad_application.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_application_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_application.h edockwidgetplugin.h emainwindowplugin.h historyviewplugin.h
-SOURCES     = qad_application.cpp edockwidgetplugin.cpp emainwindowplugin.cpp historyviewplugin.cpp
-RESOURCES   = qad_application.qrc
-TRANSLATIONS = lang/qad_application_ru.ts
-LIBS        += -L. -lqad_utils -lqad_application
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_blockview/CMakeLists.txt b/qad_blockview/CMakeLists.txt
index d516ade..cc0a732 100644
--- a/qad_blockview/CMakeLists.txt
+++ b/qad_blockview/CMakeLists.txt
@@ -1,36 +1,41 @@
 project(qad_blockview)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "blockview.h" "blockbase.h" "blockitem.h" "blockbusitem.h" "blockviewwavetrace.h" "alignedtextitem.h" "drawtools.h")
-set(CPPS "blockview.cpp" "blockbase.cpp" "blockitem.cpp" "blockbusitem.cpp" "blockviewwavetrace.cpp" "alignedtextitem.cpp" "drawtools.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils)
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_blockview SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils)
-target_link_libraries(qad_blockview ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_blockview DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_blockview DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_blockview DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_blockview DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/qad_blockview/make_lib.bat b/qad_blockview/make_lib.bat
index f1c2206..0148a43 100755
--- a/qad_blockview/make_lib.bat
+++ b/qad_blockview/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_blockview/plugin/CMakeLists.txt b/qad_blockview/plugin/CMakeLists.txt
new file mode 100644
index 0000000..1935e76
--- /dev/null
+++ b/qad_blockview/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(qad_blockview_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_blockview)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_blockview/blockviewplugin.cpp b/qad_blockview/plugin/blockviewplugin.cpp
similarity index 100%
rename from qad_blockview/blockviewplugin.cpp
rename to qad_blockview/plugin/blockviewplugin.cpp
diff --git a/qad_blockview/blockviewplugin.h b/qad_blockview/plugin/blockviewplugin.h
similarity index 100%
rename from qad_blockview/blockviewplugin.h
rename to qad_blockview/plugin/blockviewplugin.h
diff --git a/qad_blockview/qad_blockview.cpp b/qad_blockview/plugin/qad_blockview.cpp
similarity index 100%
rename from qad_blockview/qad_blockview.cpp
rename to qad_blockview/plugin/qad_blockview.cpp
diff --git a/qad_blockview/qad_blockview.h b/qad_blockview/plugin/qad_blockview.h
similarity index 100%
rename from qad_blockview/qad_blockview.h
rename to qad_blockview/plugin/qad_blockview.h
diff --git a/qad_blockview/qad_blockview.pro b/qad_blockview/qad_blockview.pro
deleted file mode 100644
index 114d62f..0000000
--- a/qad_blockview/qad_blockview.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_blockview_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_blockview.h blockviewplugin.h
-SOURCES     = qad_blockview.cpp blockviewplugin.cpp
-RESOURCES   = qad_blockview.qrc
-TRANSLATIONS = lang/qad_blockview_ru.ts
-LIBS        += -L. -lqad_widgets -lqad_utils -lqad_blockview
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_graphic/CMakeLists.txt b/qad_graphic/CMakeLists.txt
index b89b70f..ff8a1c7 100644
--- a/qad_graphic/CMakeLists.txt
+++ b/qad_graphic/CMakeLists.txt
@@ -1,38 +1,42 @@
 project(qad_graphic)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+find_package(OpenGL REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "graphic.h" "graphic_conf.h")
-set(CPPS "graphic.cpp" "graphic_conf.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils)
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
-qt4_wrap_cpp(CMOCS ${MOCS} "uwidget.h" "uglwidget.h" OPTIONS -nw)
+qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_graphic SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets qad_utils)
-find_package(OpenGL REQUIRED)
-list(APPEND LIBS ${OPENGL_LIBRARIES})
-target_link_libraries(qad_graphic ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_graphic DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_graphic DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_graphic DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_graphic DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/qad_graphic/make_lib.bat b/qad_graphic/make_lib.bat
index f1c2206..0148a43 100644
--- a/qad_graphic/make_lib.bat
+++ b/qad_graphic/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_graphic/plugin/CMakeLists.txt b/qad_graphic/plugin/CMakeLists.txt
new file mode 100644
index 0000000..791b7f9
--- /dev/null
+++ b/qad_graphic/plugin/CMakeLists.txt
@@ -0,0 +1,21 @@
+project(qad_graphic_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+find_package(OpenGL REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_graphic)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_graphic/graphicplugin.cpp b/qad_graphic/plugin/graphicplugin.cpp
similarity index 91%
rename from qad_graphic/graphicplugin.cpp
rename to qad_graphic/plugin/graphicplugin.cpp
index 0d509c7..c4ff495 100644
--- a/qad_graphic/graphicplugin.cpp
+++ b/qad_graphic/plugin/graphicplugin.cpp
@@ -44,7 +44,7 @@ QIcon GraphicPlugin::icon() const {
 
 
 QString GraphicPlugin::toolTip() const {
-	return QLatin1String("");
+	return QLatin1String("");//QLatin1String("Widget for display any math graphics with grid and navigation");
 }
 
 
diff --git a/qad_graphic/graphicplugin.h b/qad_graphic/plugin/graphicplugin.h
similarity index 100%
rename from qad_graphic/graphicplugin.h
rename to qad_graphic/plugin/graphicplugin.h
diff --git a/qad_graphic/qad_graphic.cpp b/qad_graphic/plugin/qad_graphic.cpp
similarity index 100%
rename from qad_graphic/qad_graphic.cpp
rename to qad_graphic/plugin/qad_graphic.cpp
diff --git a/qad_graphic/qad_graphic.h b/qad_graphic/plugin/qad_graphic.h
similarity index 100%
rename from qad_graphic/qad_graphic.h
rename to qad_graphic/plugin/qad_graphic.h
diff --git a/qad_graphic/qad_graphic.pro b/qad_graphic/qad_graphic.pro
deleted file mode 100644
index 9c1f0ad..0000000
--- a/qad_graphic/qad_graphic.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_graphic_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_graphic.h graphicplugin.h
-SOURCES     = qad_graphic.cpp graphicplugin.cpp
-RESOURCES   = qad_graphic.qrc
-TRANSLATIONS = lang/qad_graphic_ru.ts
-LIBS        += -L. -lqad_widgets -lqad_utils -lqad_graphic
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_sql_table/CMakeLists.txt b/qad_sql_table/CMakeLists.txt
index 1e997e8..7b8225e 100644
--- a/qad_sql_table/CMakeLists.txt
+++ b/qad_sql_table/CMakeLists.txt
@@ -1,36 +1,41 @@
 project(qad_sql_table)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "sql_table_widget.h" "sql_record_widget.h")
-set(CPPS "sql_table_widget.cpp" "sql_record_widget.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} qad_widgets qad_utils)
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_sql_table SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTSQL_LIBRARY} qad_widgets qad_utils)
-target_link_libraries(qad_sql_table ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_sql_table DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_sql_table DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_sql_table DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_sql_table DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/qad_sql_table/make_lib.bat b/qad_sql_table/make_lib.bat
index f1c2206..0148a43 100644
--- a/qad_sql_table/make_lib.bat
+++ b/qad_sql_table/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_sql_table/plugin/CMakeLists.txt b/qad_sql_table/plugin/CMakeLists.txt
new file mode 100644
index 0000000..9ed7228
--- /dev/null
+++ b/qad_sql_table/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(qad_sql_table_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_sql_table)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_sql_table/qad_sql_table.cpp b/qad_sql_table/plugin/qad_sql_table.cpp
similarity index 100%
rename from qad_sql_table/qad_sql_table.cpp
rename to qad_sql_table/plugin/qad_sql_table.cpp
diff --git a/qad_sql_table/qad_sql_table.h b/qad_sql_table/plugin/qad_sql_table.h
similarity index 100%
rename from qad_sql_table/qad_sql_table.h
rename to qad_sql_table/plugin/qad_sql_table.h
diff --git a/qad_sql_table/sql_record_plugin.cpp b/qad_sql_table/plugin/sql_record_plugin.cpp
similarity index 100%
rename from qad_sql_table/sql_record_plugin.cpp
rename to qad_sql_table/plugin/sql_record_plugin.cpp
diff --git a/qad_sql_table/sql_record_plugin.h b/qad_sql_table/plugin/sql_record_plugin.h
similarity index 100%
rename from qad_sql_table/sql_record_plugin.h
rename to qad_sql_table/plugin/sql_record_plugin.h
diff --git a/qad_sql_table/sql_table_plugin.cpp b/qad_sql_table/plugin/sql_table_plugin.cpp
similarity index 100%
rename from qad_sql_table/sql_table_plugin.cpp
rename to qad_sql_table/plugin/sql_table_plugin.cpp
diff --git a/qad_sql_table/sql_table_plugin.h b/qad_sql_table/plugin/sql_table_plugin.h
similarity index 100%
rename from qad_sql_table/sql_table_plugin.h
rename to qad_sql_table/plugin/sql_table_plugin.h
diff --git a/qad_sql_table/qad_sql_table.pro b/qad_sql_table/qad_sql_table.pro
deleted file mode 100644
index 1190c75..0000000
--- a/qad_sql_table/qad_sql_table.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-### eqmake4 was here ###
-QT += sql
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_sql_table_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_sql_table.h sql_table_plugin.h sql_record_plugin.h
-SOURCES     = qad_sql_table.cpp sql_table_plugin.cpp sql_record_plugin.cpp
-RESOURCES   = qad_sql_table.qrc
-TRANSLATIONS = lang/qad_sql_table_ru.ts
-LIBS        += -L. -lqad_widgets -lqad_sql_table
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_utils/CMakeLists.txt b/qad_utils/CMakeLists.txt
index 75c099a..3eeed94 100644
--- a/qad_utils/CMakeLists.txt
+++ b/qad_utils/CMakeLists.txt
@@ -1,40 +1,41 @@
 project(qad_utils)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "qpiconfig.h" "qpiconfigwidget.h" "qpievaluator.h"
-			"qpiconfignewdialog.h" "qpiconfigvaluewidget.h"
-			"session_manager.h" "chunkstream.h")
-set(CPPS "qpiconfig.cpp" "qpiconfigwidget.cpp" "qpievaluator.cpp"
-			"qpiconfignewdialog.cpp" "qpiconfigvaluewidget.cpp"
-			"session_manager.cpp" "chunkstream.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_utils SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} qad_widgets)
-target_link_libraries(qad_utils ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_utils DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_utils DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_utils DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_utils DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/qad_utils/make_lib.bat b/qad_utils/make_lib.bat
index f1c2206..0148a43 100644
--- a/qad_utils/make_lib.bat
+++ b/qad_utils/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_utils/plugin/CMakeLists.txt b/qad_utils/plugin/CMakeLists.txt
new file mode 100644
index 0000000..d839d82
--- /dev/null
+++ b/qad_utils/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(qad_utils_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_utils)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_utils/qad_utils.cpp b/qad_utils/plugin/qad_utils.cpp
similarity index 100%
rename from qad_utils/qad_utils.cpp
rename to qad_utils/plugin/qad_utils.cpp
diff --git a/qad_utils/qad_utils.h b/qad_utils/plugin/qad_utils.h
similarity index 100%
rename from qad_utils/qad_utils.h
rename to qad_utils/plugin/qad_utils.h
diff --git a/qad_utils/qpiconfigplugin.cpp b/qad_utils/plugin/qpiconfigplugin.cpp
similarity index 100%
rename from qad_utils/qpiconfigplugin.cpp
rename to qad_utils/plugin/qpiconfigplugin.cpp
diff --git a/qad_utils/qpiconfigplugin.h b/qad_utils/plugin/qpiconfigplugin.h
similarity index 100%
rename from qad_utils/qpiconfigplugin.h
rename to qad_utils/plugin/qpiconfigplugin.h
diff --git a/qad_utils/qad_utils.pro b/qad_utils/qad_utils.pro
deleted file mode 100644
index 9312698..0000000
--- a/qad_utils/qad_utils.pro
+++ /dev/null
@@ -1,16 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_utils_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_utils.h qpiconfigplugin.h
-SOURCES     = qad_utils.cpp qpiconfigplugin.cpp
-#RESOURCES   = qad_utils.qrc
-#TRANSLATIONS = lang/ru.ts
-LIBS        += -L. -lqad_utils -lqad_widgets
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_utils/qpiconfigwidget.pri b/qad_utils/qpiconfigwidget.pri
deleted file mode 100644
index c0a7c1f..0000000
--- a/qad_utils/qpiconfigwidget.pri
+++ /dev/null
@@ -1,8 +0,0 @@
-### eqmake4 was here ###
-HEADERS += qpiconfig.h qpiconfigwidget.h qpiconfignewdialog.h qpiconfigvaluewidget.h
-SOURCES += qpiconfig.cpp qpiconfigwidget.cpp qpiconfignewdialog.cpp qpiconfigvaluewidget.cpp
-FORMS += qpiconfignewdialog.ui
-
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qad_widgets/CMakeLists.txt b/qad_widgets/CMakeLists.txt
index 7c3e7ed..3c5f7a2 100644
--- a/qad_widgets/CMakeLists.txt
+++ b/qad_widgets/CMakeLists.txt
@@ -1,43 +1,41 @@
 project(qad_widgets)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "qpiconsole.h" "spinslider.h"
-			"colorbutton.h" "chardialog.h" "shortcuts.h"
-			"qipedit.h" "clineedit.h" "ecombobox.h"
-			"qpointedit.h" "qrectedit.h" "iconedlabel.h"
-			"qcodeedit.h" "qvariantedit.h")
-set(CPPS "qpiconsole.cpp" "spinslider.cpp" "colorbutton.cpp"
-			"chardialog.cpp" "shortcuts.cpp" "qipedit.cpp"
-			"clineedit.cpp" "ecombobox.cpp" "qpointedit.cpp"
-			"qrectedit.cpp" "qcodeedit.cpp" "qvariantedit.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(qad_widgets SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-target_link_libraries(qad_widgets ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qad_widgets DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS qad_widgets DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qad_widgets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qad_widgets DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/qad_widgets/make_lib.bat b/qad_widgets/make_lib.bat
index f1c2206..0148a43 100644
--- a/qad_widgets/make_lib.bat
+++ b/qad_widgets/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/qad_widgets/plugin/CMakeLists.txt b/qad_widgets/plugin/CMakeLists.txt
new file mode 100644
index 0000000..baaa3a7
--- /dev/null
+++ b/qad_widgets/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(qad_widgets_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} qad_widgets)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/qad_widgets/chardialogplugin.cpp b/qad_widgets/plugin/chardialogplugin.cpp
similarity index 100%
rename from qad_widgets/chardialogplugin.cpp
rename to qad_widgets/plugin/chardialogplugin.cpp
diff --git a/qad_widgets/chardialogplugin.h b/qad_widgets/plugin/chardialogplugin.h
similarity index 100%
rename from qad_widgets/chardialogplugin.h
rename to qad_widgets/plugin/chardialogplugin.h
diff --git a/qad_widgets/clineeditplugin.cpp b/qad_widgets/plugin/clineeditplugin.cpp
similarity index 100%
rename from qad_widgets/clineeditplugin.cpp
rename to qad_widgets/plugin/clineeditplugin.cpp
diff --git a/qad_widgets/clineeditplugin.h b/qad_widgets/plugin/clineeditplugin.h
similarity index 100%
rename from qad_widgets/clineeditplugin.h
rename to qad_widgets/plugin/clineeditplugin.h
diff --git a/qad_widgets/colorbuttonplugin.cpp b/qad_widgets/plugin/colorbuttonplugin.cpp
similarity index 100%
rename from qad_widgets/colorbuttonplugin.cpp
rename to qad_widgets/plugin/colorbuttonplugin.cpp
diff --git a/qad_widgets/colorbuttonplugin.h b/qad_widgets/plugin/colorbuttonplugin.h
similarity index 100%
rename from qad_widgets/colorbuttonplugin.h
rename to qad_widgets/plugin/colorbuttonplugin.h
diff --git a/qad_widgets/ecomboboxplugin.cpp b/qad_widgets/plugin/ecomboboxplugin.cpp
similarity index 100%
rename from qad_widgets/ecomboboxplugin.cpp
rename to qad_widgets/plugin/ecomboboxplugin.cpp
diff --git a/qad_widgets/ecomboboxplugin.h b/qad_widgets/plugin/ecomboboxplugin.h
similarity index 100%
rename from qad_widgets/ecomboboxplugin.h
rename to qad_widgets/plugin/ecomboboxplugin.h
diff --git a/qad_widgets/iconedlabelplugin.h b/qad_widgets/plugin/iconedlabelplugin.h
similarity index 100%
rename from qad_widgets/iconedlabelplugin.h
rename to qad_widgets/plugin/iconedlabelplugin.h
diff --git a/qad_widgets/lconedlabelplugin.cpp b/qad_widgets/plugin/lconedlabelplugin.cpp
similarity index 100%
rename from qad_widgets/lconedlabelplugin.cpp
rename to qad_widgets/plugin/lconedlabelplugin.cpp
diff --git a/qad_widgets/qad_widgets.cpp b/qad_widgets/plugin/qad_widgets.cpp
similarity index 100%
rename from qad_widgets/qad_widgets.cpp
rename to qad_widgets/plugin/qad_widgets.cpp
diff --git a/qad_widgets/qad_widgets.h b/qad_widgets/plugin/qad_widgets.h
similarity index 100%
rename from qad_widgets/qad_widgets.h
rename to qad_widgets/plugin/qad_widgets.h
diff --git a/qad_widgets/qcodeeditplugin.cpp b/qad_widgets/plugin/qcodeeditplugin.cpp
similarity index 100%
rename from qad_widgets/qcodeeditplugin.cpp
rename to qad_widgets/plugin/qcodeeditplugin.cpp
diff --git a/qad_widgets/qcodeeditplugin.h b/qad_widgets/plugin/qcodeeditplugin.h
similarity index 100%
rename from qad_widgets/qcodeeditplugin.h
rename to qad_widgets/plugin/qcodeeditplugin.h
diff --git a/qad_widgets/qipeditplugin.cpp b/qad_widgets/plugin/qipeditplugin.cpp
similarity index 100%
rename from qad_widgets/qipeditplugin.cpp
rename to qad_widgets/plugin/qipeditplugin.cpp
diff --git a/qad_widgets/qipeditplugin.h b/qad_widgets/plugin/qipeditplugin.h
similarity index 100%
rename from qad_widgets/qipeditplugin.h
rename to qad_widgets/plugin/qipeditplugin.h
diff --git a/qad_widgets/qpiconsoleplugin.cpp b/qad_widgets/plugin/qpiconsoleplugin.cpp
similarity index 100%
rename from qad_widgets/qpiconsoleplugin.cpp
rename to qad_widgets/plugin/qpiconsoleplugin.cpp
diff --git a/qad_widgets/qpiconsoleplugin.h b/qad_widgets/plugin/qpiconsoleplugin.h
similarity index 100%
rename from qad_widgets/qpiconsoleplugin.h
rename to qad_widgets/plugin/qpiconsoleplugin.h
diff --git a/qad_widgets/qpointeditplugin.cpp b/qad_widgets/plugin/qpointeditplugin.cpp
similarity index 100%
rename from qad_widgets/qpointeditplugin.cpp
rename to qad_widgets/plugin/qpointeditplugin.cpp
diff --git a/qad_widgets/qpointeditplugin.h b/qad_widgets/plugin/qpointeditplugin.h
similarity index 100%
rename from qad_widgets/qpointeditplugin.h
rename to qad_widgets/plugin/qpointeditplugin.h
diff --git a/qad_widgets/qrecteditplugin.cpp b/qad_widgets/plugin/qrecteditplugin.cpp
similarity index 100%
rename from qad_widgets/qrecteditplugin.cpp
rename to qad_widgets/plugin/qrecteditplugin.cpp
diff --git a/qad_widgets/qrecteditplugin.h b/qad_widgets/plugin/qrecteditplugin.h
similarity index 100%
rename from qad_widgets/qrecteditplugin.h
rename to qad_widgets/plugin/qrecteditplugin.h
diff --git a/qad_widgets/qvarianteditplugin.cpp b/qad_widgets/plugin/qvarianteditplugin.cpp
similarity index 100%
rename from qad_widgets/qvarianteditplugin.cpp
rename to qad_widgets/plugin/qvarianteditplugin.cpp
diff --git a/qad_widgets/qvarianteditplugin.h b/qad_widgets/plugin/qvarianteditplugin.h
similarity index 100%
rename from qad_widgets/qvarianteditplugin.h
rename to qad_widgets/plugin/qvarianteditplugin.h
diff --git a/qad_widgets/shortcutsplugin.cpp b/qad_widgets/plugin/shortcutsplugin.cpp
similarity index 100%
rename from qad_widgets/shortcutsplugin.cpp
rename to qad_widgets/plugin/shortcutsplugin.cpp
diff --git a/qad_widgets/shortcutsplugin.h b/qad_widgets/plugin/shortcutsplugin.h
similarity index 100%
rename from qad_widgets/shortcutsplugin.h
rename to qad_widgets/plugin/shortcutsplugin.h
diff --git a/qad_widgets/spinsliderplugin.cpp b/qad_widgets/plugin/spinsliderplugin.cpp
similarity index 100%
rename from qad_widgets/spinsliderplugin.cpp
rename to qad_widgets/plugin/spinsliderplugin.cpp
diff --git a/qad_widgets/spinsliderplugin.h b/qad_widgets/plugin/spinsliderplugin.h
similarity index 100%
rename from qad_widgets/spinsliderplugin.h
rename to qad_widgets/plugin/spinsliderplugin.h
diff --git a/qad_widgets/qad_widgets.pro b/qad_widgets/qad_widgets.pro
deleted file mode 100644
index 3b1ff1d..0000000
--- a/qad_widgets/qad_widgets.pro
+++ /dev/null
@@ -1,28 +0,0 @@
-### eqmake4 was here ###
-CONFIG += designer plugin release
-TARGET      = $$qtLibraryTarget(qad_widgets_plugin)
-TEMPLATE    = lib
-
-HEADERS     = qad_widgets.h \
-    spinsliderplugin.h colorbuttonplugin.h \
-    chardialogplugin.h shortcutsplugin.h qipeditplugin.h \
-    clineeditplugin.h ecomboboxplugin.h \
-    qpointeditplugin.h qrecteditplugin.h \
-    qpiconsoleplugin.h iconedlabelplugin.h \
-    qcodeeditplugin.h qvarianteditplugin.h
-SOURCES     = qad_widgets.cpp \
-    spinsliderplugin.cpp colorbuttonplugin.cpp \
-    chardialogplugin.cpp shortcutsplugin.cpp qipeditplugin.cpp \
-    clineeditplugin.cpp ecomboboxplugin.cpp \
-    qpointeditplugin.cpp qrecteditplugin.cpp \
-    qpiconsoleplugin.cpp lconedlabelplugin.cpp \
-    qcodeeditplugin.cpp qvarianteditplugin.cpp
-RESOURCES   = qad_widgets.qrc
-TRANSLATIONS = lang/qad_widgets_ru.ts
-LIBS        += -L. -lqad_widgets
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release
diff --git a/qglview/CMakeLists.txt b/qglview/CMakeLists.txt
index c720561..fb41cfb 100644
--- a/qglview/CMakeLists.txt
+++ b/qglview/CMakeLists.txt
@@ -1,16 +1,18 @@
 project(qglview)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} qad_widgets qad_utils)
 find_package(OpenGL REQUIRED)
-list(APPEND LIBS ${OPENGL_LIBRARIES})
-
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} ${OPENGL_LIBRARIES} qad_widgets qad_utils)
 file(GLOB MOCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h")
 file(GLOB CPPS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cpp")
 file(GLOB UIS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.ui")
@@ -21,25 +23,24 @@ list(REMOVE_ITEM UIS "qglview_window.ui")
 qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_wrap_ui(CUIS ${UIS})
 qt4_add_resources(CRES ${RES})
-add_library(qglview SHARED ${CPPS} ${CMOCS} ${CUIS} ${CRES})
-target_link_libraries(qglview ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CMOCS} ${CUIS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS qglview DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS qglview DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS qglview DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
-
 qt4_wrap_cpp(CMOCS_TEST "qglview_window.h" OPTIONS -nw)
 qt4_wrap_ui(CUIS_TEST "qglview_window.ui")
 add_executable(qglview_test "main.cpp" "qglview_window.cpp" ${CMOCS_TEST} ${CUIS_TEST} ${CRES})
-target_link_libraries(qglview_test ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${QT_QTXML_LIBRARY} qglview qad_widgets qad_utils)
+target_link_libraries(qglview_test ${LIBS} ${PROJECT_NAME})
diff --git a/qglview/make_lib.bat b/qglview/make_lib.bat
index f1c2206..0148a43 100644
--- a/qglview/make_lib.bat
+++ b/qglview/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/touch_widgets/CMakeLists.txt b/touch_widgets/CMakeLists.txt
index 81f82bc..38895c9 100644
--- a/touch_widgets/CMakeLists.txt
+++ b/touch_widgets/CMakeLists.txt
@@ -1,36 +1,41 @@
 project(touch_widgets)
 cmake_minimum_required(VERSION 2.6)
 find_package(Qt4 REQUIRED)
+if (MINGW)
+	find_package(MinGW REQUIRED)
+endif()
 include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
-
+option(LIB "System install" 0)
+option(DEBUG "Build with -g3" 0)
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
-
-set(MOCS "touchbutton.h" "touchbuttframe.h" "touchslider.h" "touch_bar.h")
-set(CPPS "touchbutton.cpp" "touchbuttframe.cpp" "touchslider.cpp")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+file(GLOB MOCS "./*.h")
+file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
 file(GLOB RES "./*.qrc")
 qt4_wrap_ui(CUIS ${UIS})
-qt4_wrap_cpp(CMOCS ${MOCS})
+qt4_wrap_cpp(CMOCS ${MOCS} OPTIONS -nw)
 qt4_add_resources(CRES ${RES})
-add_library(touch_widgets SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
-target_link_libraries(touch_widgets ${LIBS})
-if (DEFINED LIB)
-	set(LIB 1)
-	if (${WIN32})
-		find_package(MinGW REQUIRED)
+add_library(${PROJECT_NAME} SHARED ${CPPS} ${CUIS} ${CMOCS} ${CRES} ${MOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIB)
+	if (WIN32)
 		set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
 		install(FILES ${MOCS} DESTINATION ${MINGW_INCLUDE})
-		install(TARGETS touch_widgets DESTINATION ${MINGW_LIB})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
-		install(TARGETS touch_widgets DESTINATION ${QTDIR})
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 	else ()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${MOCS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
-		install(TARGETS touch_widgets DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 	endif ()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 else ()
-	install(TARGETS touch_widgets DESTINATION bin)
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
 endif ()
+add_subdirectory(plugin)
diff --git a/touch_widgets/make_lib.bat b/touch_widgets/make_lib.bat
index f1c2206..0148a43 100644
--- a/touch_widgets/make_lib.bat
+++ b/touch_widgets/make_lib.bat
@@ -1 +1 @@
-cmake_mgw -DLIB= && make install && qmake && make install
+cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*
diff --git a/touch_widgets/plugin/CMakeLists.txt b/touch_widgets/plugin/CMakeLists.txt
new file mode 100644
index 0000000..b72017a
--- /dev/null
+++ b/touch_widgets/plugin/CMakeLists.txt
@@ -0,0 +1,20 @@
+project(touch_widgets_plugin)
+cmake_minimum_required(VERSION 2.6)
+find_package(Qt4 REQUIRED)
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} "..")
+option(DEBUG "Build with -g3" 0)
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
+if (DEBUG)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
+endif ()
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES})
+add_definitions(-DQT_PLUGIN)
+add_definitions(-DQT_NO_DEBUG)
+add_definitions(-DQT_SHARED)
+add_definitions(-DQDESIGNER_EXPORT_WIDGETS)
+file(GLOB PMOCS "./*.h")
+file(GLOB PCPPS "./*.cpp")
+qt4_wrap_cpp(PCMOCS ${PMOCS} OPTIONS -nw)
+add_library(${PROJECT_NAME} SHARED ${PCMOCS} ${PCPPS} ${PMOCS})
+target_link_libraries(${PROJECT_NAME} ${LIBS} ${QT_QTDESIGNER_LIBRARY} touch_widgets)
+install(TARGETS ${PROJECT_NAME} DESTINATION ${QT_PLUGINS_DIR}/designer)
diff --git a/touch_widgets/tw.cpp b/touch_widgets/plugin/touch_widgets.cpp
similarity index 94%
rename from touch_widgets/tw.cpp
rename to touch_widgets/plugin/touch_widgets.cpp
index b075db9..fbfc43c 100644
--- a/touch_widgets/tw.cpp
+++ b/touch_widgets/plugin/touch_widgets.cpp
@@ -1,7 +1,7 @@
 #include "touchsliderplugin.h"
 #include "touchbuttframeplugin.h"
 #include "touchbuttonplugin.h"
-#include "tw.h"
+#include "touch_widgets.h"
 
 TW::TW(QObject *parent)
         : QObject(parent)
diff --git a/touch_widgets/tw.h b/touch_widgets/plugin/touch_widgets.h
similarity index 100%
rename from touch_widgets/tw.h
rename to touch_widgets/plugin/touch_widgets.h
diff --git a/touch_widgets/touchbuttframeplugin.cpp b/touch_widgets/plugin/touchbuttframeplugin.cpp
similarity index 100%
rename from touch_widgets/touchbuttframeplugin.cpp
rename to touch_widgets/plugin/touchbuttframeplugin.cpp
diff --git a/touch_widgets/touchbuttframeplugin.h b/touch_widgets/plugin/touchbuttframeplugin.h
similarity index 100%
rename from touch_widgets/touchbuttframeplugin.h
rename to touch_widgets/plugin/touchbuttframeplugin.h
diff --git a/touch_widgets/touchbuttonplugin.cpp b/touch_widgets/plugin/touchbuttonplugin.cpp
similarity index 100%
rename from touch_widgets/touchbuttonplugin.cpp
rename to touch_widgets/plugin/touchbuttonplugin.cpp
diff --git a/touch_widgets/touchbuttonplugin.h b/touch_widgets/plugin/touchbuttonplugin.h
similarity index 100%
rename from touch_widgets/touchbuttonplugin.h
rename to touch_widgets/plugin/touchbuttonplugin.h
diff --git a/touch_widgets/touchsliderplugin.cpp b/touch_widgets/plugin/touchsliderplugin.cpp
similarity index 100%
rename from touch_widgets/touchsliderplugin.cpp
rename to touch_widgets/plugin/touchsliderplugin.cpp
diff --git a/touch_widgets/touchsliderplugin.h b/touch_widgets/plugin/touchsliderplugin.h
similarity index 100%
rename from touch_widgets/touchsliderplugin.h
rename to touch_widgets/plugin/touchsliderplugin.h
diff --git a/touch_widgets/touch_widgets.pro b/touch_widgets/touch_widgets.pro
deleted file mode 100644
index 2729bd6..0000000
--- a/touch_widgets/touch_widgets.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-CONFIG      += designer plugin release
-TARGET      = $$qtLibraryTarget(touch_widgets_plugin)
-TEMPLATE    = lib
-
-HEADERS     = touchsliderplugin.h touchbuttframeplugin.h tw.h touchbuttonplugin.h
-SOURCES     = touchsliderplugin.cpp touchbuttframeplugin.cpp tw.cpp touchbuttonplugin.cpp
-RESOURCES   = touch_widgets.qrc
-LIBS        += -L. -ltouch_widgets
-
-target.path = $$[QT_INSTALL_PLUGINS]/designer
-INSTALLS    += target
-
-CONFIG -= debug_and_release debug
-CONFIG += release