From 20076e54c656a15bbae7029cd9a61b064cf5ca81 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, 1 Dec 2016 12:26:37 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/libs@145
 a8b55f48-bf90-11e4-a774-851b48703e85

---
 CMakeLists.txt            |  3 ---
 make_libs.bat             |  2 +-
 piqt_utils/CMakeLists.txt | 39 +++++++++++++++++++++------------------
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 61e1955..eecb7f3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,9 +19,6 @@ endforeach(F)
 set(PIP_CMG "${CMAKE_CURRENT_BINARY_DIR}/pip/utils/code_model_generator/pip_cmg")
 if (WIN32)
 	set(PIP_DLL_DIR "${CMAKE_CURRENT_BINARY_DIR}/pip")
-	string(REPLACE "/" "\\" PIP_DLL_DIR_W "${PIP_DLL_DIR}")
-	set(ENV{PATH} "$ENV{PATH}\;${PIP_DLL_DIR_W}")
-	#message($ENV{PATH})
 endif()
 
 set(LIST_LIBS pip qad_widgets qad_utils qad_application qad_blockview qad_graphic qad_sql_table piqt mbricks cd_utils kx_utils piqt_utils touch_widgets qglview)
diff --git a/make_libs.bat b/make_libs.bat
index 0de39a6..9cdb69e 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
+cd ..\libs_build_win && cmake_mgw ..\libs -DICU=1 -DUSB=1 -DCRYPT=1 && make install -j8 && cd ../libs && pause
 :: && 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/piqt_utils/CMakeLists.txt b/piqt_utils/CMakeLists.txt
index ca96b4f..2156cc8 100644
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -1,21 +1,21 @@
 project(piqt_utils)
 cmake_minimum_required(VERSION 2.6)
-if (MINGW)
+if(MINGW)
 	find_package(MinGW REQUIRED)
 endif()
 find_package(Qt4 REQUIRED)
-if (LIBPROJECT)
+if(LIBPROJECT)
 	include(PIPMacros)
-else ()
+else()
 	find_package(PIP REQUIRED)
-endif ()
+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")
-if (DEBUG)
+if(DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
-endif ()
+endif()
 set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${PIP_LIBRARY} qad_widgets qad_utils qad_blockview)
 pip_code_model(CCM "../pip/src/io/piiodevice.h" OPTIONS "-DPIP_EXPORT" "-Es")
 #message(STATUS "pip_code_model for iodevice = ${CCM}")
@@ -25,12 +25,15 @@ 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})
+if(DEFINED ENV{QNX_HOST})
 	add_library(${PROJECT_NAME} STATIC ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
-else ()
+else()
 	add_library(${PROJECT_NAME} SHARED ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
-endif ()
+endif()
 target_link_libraries(${PROJECT_NAME} ${LIBS})
+if (LIBPROJECT)
+	add_dependencies(piqt_utils pip_cmg)
+endif()
 if (NOT DEFINED ENV{QNX_HOST})
 	set(CPPS "pidumper.cpp" "pidumper_main.cpp")
 	set(MOCS "pidumper.h")
@@ -54,26 +57,26 @@ if (NOT DEFINED ENV{QNX_HOST})
 
 	add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})
 	target_link_libraries(piconnectionedit ${LIBS} ${PROJECT_NAME})
-endif ()
-if (LIB)
-	if (WIN32)
+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})
 		get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
-	else ()
+	else()
 		set(CMAKE_INSTALL_PREFIX /usr)
 		install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 		install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
-	endif ()
+	endif()
 	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
-else ()
+else()
 	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 	message(STATUS "Install to local \"bin\"")
-endif ()
-if (NOT DEFINED ENV{QNX_HOST})
+endif()
+if(NOT DEFINED ENV{QNX_HOST})
 	install(TARGETS pidumper DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
 	install(TARGETS piconnectionedit DESTINATION ${CMAKE_INSTALL_PREFIX}/bin)
-endif ()
+endif()