Multi-Qt building

git-svn-id: svn://db.shs.com.ru/libs@250 a8b55f48-bf90-11e4-a774-851b48703e85
2017-08-03 08:09:44 +00:00
parent 96935ebb4a
commit 0834c45c90
78 changed files with 410 additions and 249 deletions
--- a/piqt_utils/CMakeLists.txt
+++ b/piqt_utils/CMakeLists.txt
@@ -1,6 +1,6 @@
 project(piqt_utils)
 cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0017 OLD)
+#cmake_policy(SET CMP0017 OLD)
 if(LIBPROJECT)
 	include(PIPMacros)
 	include(SDKMacros)
@@ -13,21 +13,28 @@ else()
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	endif()
 endif()
-find_package(QAD REQUIRED)
-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(LIBTYPE SHARED)
 if(DEFINED ENV{QNX_HOST})
-	add_library(${PROJECT_NAME} STATIC ${H} ${CPP} ${CCM})
-else()
-	add_library(${PROJECT_NAME} SHARED ${H} ${CPP} ${CCM})
+	set(LIBTYPE STATIC)
 endif()
-set(LIBS ${QAD_WIDGETS_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_BLOCKVIEW_LIBRARY} ${PIP_LIBRARY})
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+find_package(QAD REQUIRED)
+list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
+set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
+include_directories(${PIP_INCLUDES} ${QAD_INCLUDES})
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+pip_code_model(CCM "../pip/src_main/io/piiodevice.h" "../pip/src_main/io/pipacketextractor.h" OPTIONS "-DPIP_EXPORT" "-Es")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_library(${PROJECT_NAME} ${LIBTYPE} out_CPP CCM)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_blockview)
 message(STATUS "Building ${PROJECT_NAME}")

 if (LIBPROJECT)
-	add_dependencies(piqt_utils pip_cmg)
+	foreach(_v ${_QT_VERSIONS_})
+		if (LOCAL_FOUND${_v})
+			add_dependencies(piqt_utils${_v} pip_cmg)
+		endif()
+	endforeach()
 endif()

 if (NOT DEFINED ENV{QNX_HOST})
@@ -36,30 +43,28 @@ if (NOT DEFINED ENV{QNX_HOST})
 	add_subdirectory(piintrospector)
 endif()

-if (LIBPROJECT)
-	sdk_install("pip" "${PROJECT_NAME}" "${H}")
+if(LIBPROJECT)
+	sdk_install("pip" "${PROJECT_NAME}" "${out_HDR}")
 else()
 	if(LIB)
 		if(WIN32)
 			set(CMAKE_INSTALL_PREFIX ${MINGW_DIR})
-			install(FILES ${H} DESTINATION ${MINGW_INCLUDE}/pip)
-			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})
+			install(FILES ${out_HDR} DESTINATION ${MINGW_INCLUDE}/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_LIB})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION QtBin)
 		else()
 			if(APPLE)
 				set(CMAKE_INSTALL_PREFIX /usr/local)
 			else()
 				set(CMAKE_INSTALL_PREFIX /usr)
-				install(TARGETS ${_TARGETS} DESTINATION /usr/bin)
 			endif()
-			install(FILES ${H} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
-			install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
+			install(FILES ${out_HDR} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/pip)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
 		endif()
 		message(STATUS "Install ${PROJECT_NAME} to system \"${CMAKE_INSTALL_PREFIX}\"")
 	else()
-		install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
 		message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 	endif()
 endif()
--- a/piqt_utils/piconnedit/CMakeLists.txt
+++ b/piqt_utils/piconnedit/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(piconnedit PICONNEDIT_H PICONNEDIT_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PICONNEDIT_H} ${PICONNEDIT_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(piconnedit)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	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\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/pidumper/CMakeLists.txt
+++ b/piqt_utils/pidumper/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(pidumper PIDUMPER_H PIDUMPER_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PIDUMPER_H} ${PIDUMPER_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(pidumper)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	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\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/pidumper/pidumper.cpp
+++ b/piqt_utils/pidumper/pidumper.cpp
@@ -10,7 +10,11 @@

 PIDumper::PIDumper(QWidget * parent): QMainWindow(parent) {
 	setupUi(this);
+#if QT_VERSION >= 0x050000
+	treeDump->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
 	treeDump->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
 }


--- a/piqt_utils/piintrospector/CMakeLists.txt
+++ b/piqt_utils/piintrospector/CMakeLists.txt
@@ -1,21 +1,22 @@
-qt_project(piintrospector PIINTROSPECTOR_H PIINTROSPECTOR_CPP)
-add_executable(${PROJECT_NAME} WIN32 ${PIINTROSPECTOR_H} ${PIINTROSPECTOR_CPP})
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QAD_UTILS_LIBRARY} ${QAD_WIDGETS_LIBRARY} piqt_utils)
-target_link_libraries(${PROJECT_NAME} ${LIBS})
+project(piintrospector)
+file(GLOB SRC "*.h" "*.cpp" "*.ui" "*.qrc" "lang/*.ts")
+find_qt(${QtVersions} Core Gui)
+qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
+qt_add_executable(${PROJECT_NAME} WIN32 out_CPP)
+qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets piqt_utils)
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)
-		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+		qt_install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
 	else()
 		if(APPLE)
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
 		else()
-			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+			qt_install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
 		endif()
 	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\"")
+	qt_install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	#message(STATUS "Install ${PROJECT_NAME} to local \"bin\"")
 endif()
-
--- a/piqt_utils/piintrospector/piintrospector.cpp
+++ b/piqt_utils/piintrospector/piintrospector.cpp
@@ -7,7 +7,11 @@

 QPIIntrospector::QPIIntrospector(QWidget * parent): QMainWindow(parent), peer("__introspection_client__") {
 	setupUi(this);
+#if QT_VERSION >= 0x050000
+	tree->header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+#else
 	tree->header()->setResizeMode(QHeaderView::ResizeToContents);
+#endif
 	CONNECTU(&peer, dataReceivedEvent, this, peerReceived)
 	startTimer(100);
 }
--- a/piqt_utils/piqt_connection_edit.cpp
+++ b/piqt_utils/piqt_connection_edit.cpp
@@ -4,9 +4,6 @@
 #include "piqt_highlighter.h"
 #include "piqt.h"
 #include "picodeinfo.h"
-#include <QSqlQuery>
-#include <QSqlError>
-#include <QSqlRecord>
 #include <QCheckBox>
 #include <QMessageBox>