git-svn-id: svn://db.shs.com.ru/libs@220 a8b55f48-bf90-11e4-a774-851b48703e85

cd_utils/clean.bat

@@ -1,4 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core *.qrc.depends

cd_utils/make_lib.bat

@@ -1 +0,0 @@
-cmake -G "MinGW Makefiles" -DLIB=1 && make install . %*

piqt/CMakeLists.txt

@@ -11,8 +11,10 @@ if(NOT LIBPROJECT)
 endif()
 find_package(QAD REQUIRED)
 include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
+add_library(${PROJECT_NAME} SHARED ${H} ${CPP})
 set(LIBS ${PIP_LIBRARY} ${QAD_UTILS_LIBRARY})
-qt_project(${PROJECT_NAME} "LIB" "${LIBS}" H CPP)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIBPROJECT)
 	include(SDKMacros)

piqt_utils/CMakeLists.txt

@@ -4,93 +4,61 @@ if(LIBPROJECT)
 	include(PIPMacros)
 	include(SDKMacros)
 else()
+	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)
 	option(DEBUG "Build with -g3" 0)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -Wall")
 	if(DEBUG)
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif()
-	find_package(PIP REQUIRED)
 endif()
-find_package(Qt4 REQUIRED)
 find_package(QAD REQUIRED)
-message(STATUS "Building ${PROJECT_NAME}")
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES} ${PIP_INCLUDES} ${QAD_INCLUDES})
+include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+qt_project(${PROJECT_NAME} H CPP)
 pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
-set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
-#message(STATUS "pip_code_model for iodevice = ${CCM}")
-#message(STATUS "pip_INCLUDES = ${PIP_INCLUDES}")
-file(GLOB CPPS_UTILS "piqt_*.cpp")
-file(GLOB HDRS_UTILS "piqt_*.h")
-file(GLOB UIS_UTILS "piqt_*.ui")
-qt4_wrap_ui(CUIS_UTILS ${UIS_UTILS})
-qt4_wrap_cpp(CMOCS_UTILS ${HDRS_UTILS} OPTIONS -nw)
 if(DEFINED ENV{QNX_HOST})
-	add_library(${PROJECT_NAME} STATIC ${HDRS_UTILS} ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
+	add_library(${PROJECT_NAME} STATIC ${H} ${CPP} ${CCM})
 else()
-	add_library(${PROJECT_NAME} SHARED ${HDRS_UTILS} ${CPPS_UTILS} ${CMOCS_UTILS} ${CUIS_UTILS} ${CCM})
+	add_library(${PROJECT_NAME} SHARED ${H} ${CPP} ${CCM})
 endif()
+set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
 target_link_libraries(${PROJECT_NAME} ${LIBS})
+message(STATUS "Building ${PROJECT_NAME}")
 
 if (LIBPROJECT)
 	add_dependencies(piqt_utils pip_cmg)
 endif()
 
 if (NOT DEFINED ENV{QNX_HOST})
-	file(GLOB RES "*.qrc")
-	qt4_add_resources(RESS ${RES})
-	
-	set(PIDUMPER_CPPS "pidumper.cpp" "pidumper_main.cpp")
-	set(PIDUMPER_MOCS "pidumper.h")
-	set(PIDUMPER_UIS "pidumper.ui")
-	qt4_wrap_cpp(PIDUMPER_CMOCS ${PIDUMPER_MOCS} OPTIONS -nw)
-	qt4_wrap_ui(PIDUMPER_CUIS ${PIDUMPER_UIS})
-	add_executable(pidumper ${PIDUMPER_CPPS} ${PIDUMPER_CMOCS} ${PIDUMPER_CUIS} ${RESS})
-	target_link_libraries(pidumper ${LIBS} ${PROJECT_NAME})
-
-	set(PIINTROSPECTOR_CPPS "piintrospector.cpp" "piintrospector_main.cpp")
-	set(PIINTROSPECTOR_MOCS "piintrospector.h")
-	set(PIINTROSPECTOR_UIS "piintrospector.ui")
-	qt4_wrap_cpp(PIINTROSPECTOR_CMOCS ${PIINTROSPECTOR_MOCS} OPTIONS -nw)
-	qt4_wrap_ui(PIINTROSPECTOR_CUIS ${PIINTROSPECTOR_UIS})
-	add_executable(piintrospector ${PIINTROSPECTOR_CPPS} ${PIINTROSPECTOR_CMOCS} ${PIINTROSPECTOR_CUIS} ${RESS})
-	target_link_libraries(piintrospector ${LIBS} ${PROJECT_NAME})
-
-	add_executable(piconnectionedit "piconnedit_main.cpp" ${RESS})
-	target_link_libraries(piconnectionedit ${LIBS} ${PROJECT_NAME})
-endif()
-
-if (NOT DEFINED ENV{QNX_HOST})
-	set(_TARGETS pidumper piconnectionedit)
+	add_subdirectory(piconnedit)
+	add_subdirectory(pidumper)
+	add_subdirectory(piintrospector)
 endif()
 
 if (LIBPROJECT)
-	sdk_install("pip" "${PROJECT_NAME}" "${HDRS_UTILS}")
+	sdk_install("pip" "${PROJECT_NAME}" "${H}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${HDRS_UTILS} DESTINATION ${MINGW_INCLUDE}/pip)
+			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
-			install(TARGETS ${_TARGETS} DESTINATION ${MINGW_BIN})
 			get_filename_component(QTDIR ${QT_QMAKE_EXECUTABLE} PATH)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${QTDIR})
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
-				install(TARGETS ${_TARGETS} DESTINATION /usr/local/bin)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
 				install(TARGETS ${_TARGETS} DESTINATION /usr/bin)
 			endif()
-			install(FILES ${HDRS_UTILS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
+			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
 			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
 		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
-		install(TARGETS ${_TARGETS} DESTINATION bin)
 		message(STATUS "Install to local \"bin\"")
 	endif()
 endif()

piqt_utils/clean

@@ -1,19 +0,0 @@
-#! /bin/bash
-VERBOSE=1 make clean
-rm -vf ./lib/*
-#for i in $( ls -1 ); do
-#	if [ "`ls -1 --file-type | grep $i | grep -o /`" = "/" ]; then
-#		cd $i
-#		rm -rvf ./CMakeFiles
-#		rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~
-#		cd ../
-#	fi
-#done
-rm -rvf ./CMakeFiles
-rm -vf ./CMakeCache.txt ./Makefile ./cmake_install.cmake ./install_manifest.txt ./*~ ./*cxx ./moc_* ./*.o ./ui_*.h ./core
-#cd ./include
-#for i in $( ls -1 ); do
-#	if [ "`ls -1 --file-type $i | grep -v @`" = "" ]; then
-#		rm -v $i
-#	fi
-#done

piqt_utils/clean.bat

@@ -1,4 +0,0 @@
-#make clean
-del /q /f /s CMakeFiles
-rmdir /q /s CMakeFiles
-del /q /f CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.user* *~ *cxx moc_* ui_* qrc_* *.o *.exe *.a *.dll *.lib core *.bak