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

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