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

CMakeLists.txt

@@ -1,21 +1,15 @@
 cmake_minimum_required(VERSION 3.0)
-if (POLICY CMP0020)
-	cmake_policy(SET CMP0020 NEW)
-endif()
-if (POLICY CMP0011)
-	cmake_policy(SET CMP0011 NEW)
-endif()
-#if (POLICY CMP0017)
-	#cmake_policy(SET CMP0017 OLD)
-#endif()
+cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
+cmake_policy(SET CMP0017 NEW) # need include() with .cmake
+cmake_policy(SET CMP0020 NEW) # Automatically link Qt executables to qtmain target on Windows
 if (POLICY CMP0053)
-	cmake_policy(SET CMP0053 NEW)
+	cmake_policy(SET CMP0053 NEW) # simpler variable expansion and escape sequence evaluation rules
 endif()
 project(libs)
-include(SDKMacros.cmake)
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/cmake" "${CMAKE_CURRENT_SOURCE_DIR}/qad/cmake")
+include(SDKMacros)
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 set(LIBPROJECT 1)
-set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/pip/")
 include_directories(${CMAKE_CURRENT_BINARY_DIR}/pip)
 if(MINGW)
 	find_package(MinGW REQUIRED)
@@ -62,7 +56,6 @@ if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g3")
 endif ()
-include(SDKMacros.cmake)
 set(CMAKE_CXX_STANDARD 11)
 
 set(PIP_LIBRARY pip)
@@ -107,7 +100,7 @@ endif()
 
 set(QAD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/qad)
 
-include(qad/QtWraps.cmake)
+include(QtWraps)
 find_qt(Core QUIET)
 set(QtVersions)
 set(SomeQtFound 0)
@@ -145,12 +138,13 @@ if (SomeQtFound)
 	foreach(_D ${_DIRS})
 		list(APPEND QT_MULTILIB_LIST ${_D})
 	endforeach(_D)
+	include_directories(piqt)
 else()
 	message(STATUS "None of Qt found, skip Qt-derived targets")
 endif()
+include_directories(cd_utils)
 list(INSERT _DIRS 0 cd_utils deploy_tool)
 foreach(_D ${_DIRS})
-	include_directories(${_D})
 	add_subdirectory(${_D})
 endforeach(_D)
 

cd_utils/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(cd_utils)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 1)

deploy_tool/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(deploy_tool)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 1)

piqt/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(piqt)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if(NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)

piqt/clean

@@ -1,4 +0,0 @@
-#! /bin/bash
-VERBOSE=1 make clean
-rm -rvf CMakeFiles
-rm -vf CMakeCache.txt Makefile cmake_install.cmake install_manifest.txt *.dll *.a *.so *.user* *~ *cxx moc_* ui_* qrc_* *.o *.bak

piqt/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

piqt/make_lib.bat

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

piqt_utils/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(piqt_utils)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 set(PIQT_UTILS_UTILS 1)
 if(LIBPROJECT)
 	include(PIPMacros)

piqt_utils/piconnedit/CMakeLists.txt

@@ -4,6 +4,7 @@ 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)
+qt_target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../")
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)

piqt_utils/pidumper/CMakeLists.txt

@@ -4,6 +4,7 @@ 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)
+qt_target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../")
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)

piqt_utils/piintrospector/CMakeLists.txt

@@ -6,6 +6,7 @@ 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 PII_CCM)
 qt_target_link_libraries(${PROJECT_NAME} pip qad_utils qad_widgets qad_application piqt_utils)
+qt_target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../")
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)

qad/CMakeLists.txt

@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 3.0)
+cmake_policy(SET CMP0017 NEW) # need include() with .cmake
 project(qad)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
+if ("x${CMAKE_MODULE_PATH}" STREQUAL "x")
+	set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 endif()
 if (NOT LIBPROJECT)
 	option(LIB "System install" 1)
@@ -53,7 +54,7 @@ if (NOT LIBPROJECT)
 	endif()
 endif()
 
-set(CMAKES "FindQAD.cmake" "QtWraps.cmake" "QADDeploy.cmake" "TargetArch.cmake")
+file(GLOB CMAKES "cmake/*.cmake")
 
 if (LIB)
 	install(FILES ${CMAKES} DESTINATION ${CMAKE_ROOT}/Modules)

qad/QADConfig.cmake

@@ -1 +0,0 @@
-include(${QAD_DIR}/FindQAD.cmake)

qad/cmake/FindQAD.cmake

@@ -56,7 +56,7 @@ foreach(_Q ${_QAD_LIBS})
 	#message(STATUS "Library qad_${_Q}5 (${_QU}) -> ${QAD5_${_QU}_LIBRARY} found in ${_SEARCH_DIR}")
 	list(APPEND QT_MULTILIB_LIST qad_${_Q})
 endforeach()
-list(APPEND QT_MULTILIB_LIST qglview)
+list(APPEND QT_MULTILIB_LIST qglview qglengine_core qglengine_widgets)
 foreach(_v ${_QT_VERSIONS_})
 	find_library(QGLVIEW${_v}_LIBRARY qglview${_v} ${_SEARCH_DIR})
 	set(MULTILIB_qglview_SUFFIX_Qt${_v} ${_v})

qad/cmake/QADDeploy.cmake

@@ -1,5 +1,5 @@
 if (POLICY CMP0057)
-	cmake_policy(SET CMP0057 NEW)
+	cmake_policy(SET CMP0057 NEW) # Support if() IN_LIST
 endif()
 set(__prop_names "LABEL;VERSION;FULLNAME;COMPANY;ICON;INFO")
 include(TargetArch)
@@ -307,7 +307,7 @@ macro(deploy_target _T)
 
 			COMMAND deploy_tool -W "\"${CMAKE_OBJDUMP}\"" -P windows -S windows -q "\"${Qt5_ROOT}\"" -s "\"${CMAKE_PREFIX_PATH}/bin;${MINGW_BIN};${DEPLOY_ADD_LIBPATH}${_DEP_LIBPATH}\"" -o ${_AGD} -p ${_AGD} "\"${_AGD}${_T}.exe\""
 			# zip
-			COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -9 -r "\"${_DESTINATION}/${_TV}.zip\"" "\"${_TV}_win_${MY_ARCH}\""
+			COMMAND cd "\"${_DEPLOY_DIR}\"" "&&" zip -r "\"${_DESTINATION}/${_TV}.zip\"" "\"${_TV}_win_${MY_ARCH}\""
 			COMMENT "Generating ${_TV}.zip"
 			)
 	elseif (APPLE)

qad/cmake/QtWraps.cmake

@@ -371,7 +371,7 @@ macro(qt_add_executable _NAME)
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
 			add_executable(${_TARGET} ${_PREF} ${_ARGS})
 			set(_${_NAME}_is_qt 1)
-			target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
+			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
 
 			if(APPLE)
 				set(CMAKE_INSTALL_NAME_DIR "${_PREV_CIND}")
@@ -413,7 +413,7 @@ macro(qt_add_library _NAME)
 			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
 			add_library(${_TARGET} ${_PREF} ${_ARGS})
 			set(_${_NAME}_is_qt 1)
-			target_include_directories(${_TARGET} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
+			target_include_directories(${_TARGET} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/qt${_v} ${Qt${_v}_INCLUDES})
 			#message("add lib: \"${_TARGET}\"")
 
 			if(APPLE)
@@ -485,6 +485,18 @@ macro(qt_target_compile_definitions _NAME)
 endmacro()
 
 
+# usage: qt_target_include_directories(...), syntax similar to original "target_include_directories()"
+# Add include directories to a target
+macro(qt_target_include_directories _NAME)
+	foreach(_v ${_QT_VERSIONS_})
+		if (LOCAL_FOUND${_v})
+			set(_TARGET ${_NAME}${TARGET_SUFFIX_Qt${_v}})
+			target_include_directories(${_TARGET} ${ARGN})
+		endif()
+	endforeach()
+endmacro()
+
+
 # usage: qt_install(...), syntax similar to original "install()"
 # install targets for founded Qt versions
 # if DESTINATION set to "QtBin" files will be installed

qcd_utils/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(qcd_utils)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if (NOT LIBPROJECT)
 	find_package(PIP REQUIRED)
 	option(LIB "System install" 0)

qcd_utils/pult/CMakeLists.txt

@@ -4,6 +4,7 @@ qt_sources(SRC)
 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} qad_utils qad_widgets qad_graphic qad_application qcd_utils piqt_utils)
+qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../../piqt_utils")
 message(STATUS "Building ${PROJECT_NAME}")
 if(LIB)
 	if(WIN32)

qcd_utils/pult/cdgraphics.cpp

@@ -1,5 +1,5 @@
 #include "cdgraphics.h"
-#include "ui_qcd_graphic.h"
+//#include "ui_qcd_graphic.h"
 #include "cdutils_core.h"
 #include "cdutils_x.h"
 #include "qcd_core.h"
@@ -80,8 +80,8 @@ QByteArray GDockWidget::save() const {
 	cs.add(1, windowTitle())
 	  .add(2, getList(x_list))
 	  .add(3, graphic->graphic()->save())
-	  .add(4, graphic->ui->evalHistory->expression())
-	  .add(5, graphic->ui->evalVisible->expression());
+	  .add(4, graphic->evalSpinBoxHistory()->expression())
+	  .add(5, graphic->evalSpinBoxVisible()->expression());
 	return cs.data();
 }
 
@@ -94,8 +94,8 @@ void GDockWidget::load(QByteArray ba) {
 		case 1: setWindowTitle(cs.getData<QString>()); break;
 		case 2: x_list = setList(cs.getData<QStringList>()); break;
 		case 3: graphic->graphic()->load(cs.getData<QByteArray>()); break;
-		case 4: graphic->ui->evalHistory->setExpression(cs.getData<QString>()); break;
-		case 5: graphic->ui->evalVisible->setExpression(cs.getData<QString>()); break;
+		case 4: graphic->evalSpinBoxHistory()->setExpression(cs.getData<QString>()); break;
+		case 5: graphic->evalSpinBoxVisible()->setExpression(cs.getData<QString>()); break;
 		default: break;
 		}
 	}

qcd_utils/qcd_graphic.cpp

@@ -28,3 +28,13 @@ void CDGraphicWidget::setConfigVisible(bool on) {
 bool CDGraphicWidget::isConfigVisible() const {
 	return ui->widgetConfig->isVisible();
 }
+
+
+EvalSpinBox * CDGraphicWidget::evalSpinBoxHistory() {
+	return ui->evalHistory;
+}
+
+
+EvalSpinBox * CDGraphicWidget::evalSpinBoxVisible() {
+	return ui->evalVisible;
+}

qcd_utils/qcd_graphic.h

@@ -2,6 +2,7 @@
 #define QCD_GRAPHIC_H
 
 #include <QWidget>
+#include <evalspinbox.h>
 #include <pistring.h>
 
 namespace CDUtils {
@@ -14,6 +15,7 @@ namespace Ui {
 }
 
 class Graphic;
+class Graphic;
 
 
 class CDGraphicWidget: public QWidget {
@@ -26,6 +28,9 @@ public:
 	Graphic * graphic() const;
 	bool isConfigVisible() const;
 
+	EvalSpinBox * evalSpinBoxHistory();
+	EvalSpinBox * evalSpinBoxVisible();
+
 public slots:
 	void setConfigVisible(bool on);
 

qglengine/CMakeLists.txt

@@ -3,11 +3,7 @@ project(qglengine)
 find_package(QAD REQUIRED)
 if (NOT Qt5)
 	message(WARNING "Building ${PROJECT_NAME} available only on Qt5!")
-	return()
-endif()
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
+else()
 	if (IBPROJECT)
 		include(SDKMacros)
 	else()
@@ -23,7 +19,6 @@ if (MINGW)
 		find_package(MinGW REQUIRED)
 	endif()
 	find_package(OpenGL REQUIRED)
-include_directories(${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core")
 	find_qt(Qt5 Core Gui OpenGL Xml)
 	qt_sources(SRC)
 	qt_sources(FSRC DIR "formats")
@@ -34,6 +29,7 @@ qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 	file(GLOB PHS "*_p.h" "formats/*_p.h" "core/*_p.h")
 	list(REMOVE_ITEM out_HDR "${PHS}")
 	qt_add_library(qglengine_core SHARED out_CPP)
+	qt_target_include_directories(qglengine_core PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core")
 	qt_target_link_libraries(qglengine_core qad_utils qad_widgets assimp ${OPENGL_LIBRARIES})
 	message(STATUS "Building qglengine_core")
 	list(APPEND QT_MULTILIB_LIST qglengine_core)
@@ -72,5 +68,7 @@ endif()
 
 	qt_sources(test_SRC DIR "qglview_test")
 	qt_wrap(${test_SRC} CPPS test_CPP)
-qt_add_executable(qglview_test test_CPP)
-qt_target_link_libraries(qglview_test qglengine_core qglengine_widgets)
+	qt_add_executable(qglengine_test test_CPP)
+	qt_target_link_libraries(qglengine_test qglengine_core qglengine_widgets)
+	qt_target_include_directories(qglengine_test PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/core" "${CMAKE_CURRENT_SOURCE_DIR}/widgets")
+endif()

qglengine/widgets/CMakeLists.txt

@@ -10,6 +10,7 @@ file(GLOB PHS "*_p.h")
 list(REMOVE_ITEM out_HDR "${PHS}")
 qt_add_library(${PROJECT_NAME} SHARED out_CPP)
 qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets qglengine_core)
+qt_target_include_directories(${PROJECT_NAME} PRIVATE ${QAD_INCLUDES} "${CMAKE_CURRENT_SOURCE_DIR}/../" "${CMAKE_CURRENT_SOURCE_DIR}/../core")
 list(APPEND QT_MULTILIB_LIST ${PROJECT_NAME})
 set(QT_MULTILIB_LIST ${QT_MULTILIB_LIST} PARENT_SCOPE)
 message(STATUS "Building ${PROJECT_NAME}")

qglview/CMakeLists.txt

@@ -1,8 +1,5 @@
 cmake_minimum_required(VERSION 3.0)
 project(qglview)
-if (POLICY CMP0017)
-	cmake_policy(SET CMP0017 NEW)
-endif()
 if (IBPROJECT)
 	include(SDKMacros)
 else()
@@ -25,6 +22,7 @@ qt_sources(SRC)
 qt_wrap(${SRC} HDRS out_HDR CPPS out_CPP QMS out_QM)
 qt_add_library(${PROJECT_NAME} SHARED out_CPP)
 qt_target_link_libraries(${PROJECT_NAME} qad_utils qad_widgets ${OPENGL_LIBRARIES})
+qt_target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "Building ${PROJECT_NAME}")
 if (LIBPROJECT)
 	sdk_install("qad" "${PROJECT_NAME}" "${out_HDR}" "${out_QM}")