BIG deep clean

2020-06-10 13:14:16 +03:00
parent f579718e0b
commit c59579d5d5
222 changed files with 2392 additions and 11600 deletions
--- a/cmake/DeployMacros.cmake
+++ b/cmake/DeployMacros.cmake
@@ -388,16 +388,14 @@ macro(__add_file_or_dir _DIR_VAR _FILE_VAR _PATH _RELPATH)
 	else()
 		set(_p "${_RELPATH}/${_PATH}")
 	endif()
-	#if (EXISTS "${_p}")
-		if ("${_p}" MATCHES ".*/$")
-			string(LENGTH "${_p}" __sl)
-			math(EXPR __sl ${__sl}-1)
-			string(SUBSTRING "${_p}" 0 ${__sl} _p)
-			list(APPEND ${_DIR_VAR} "${_p}")
-		else()
-			list(APPEND ${_FILE_VAR} "${_p}")
-		endif()
-	#endif()
+	if ("${_p}" MATCHES ".*/$")
+		string(LENGTH "${_p}" __sl)
+		math(EXPR __sl ${__sl}-1)
+		string(SUBSTRING "${_p}" 0 ${__sl} _p)
+		list(APPEND ${_DIR_VAR} "${_p}")
+	else()
+		list(APPEND ${_FILE_VAR} "${_p}")
+	endif()
 endmacro()

 set(__win_host 0)
@@ -617,7 +615,6 @@ macro(deploy_target _T)
 	foreach (_L ${DEPLOY_ADD_LIBPATH})
 		set(_add_search_path "${_add_search_path}${_dt_delim}${_L}")
 	endforeach()
-	#set(_add_search_path "${_add_search_path}")
 	#message("app depend ${_T} libpath ${_add_search_path}")
 	set(_CMD_)
 	set(_deployed)
@@ -643,8 +640,6 @@ macro(deploy_target _T)
 				endif()
 			endforeach()
 		endif()
-		#execute_process(COMMAND "lsb_release -si" OUTPUT_VARIABLE _os_id)
-		#execute_process(COMMAND "lsb_release -sr" OUTPUT_VARIABLE _os_ver)
 		set(_build "${${_T}_VERSION_BUILD}")
 		if (NOT "x${_build}" STREQUAL "x")
 			set(_build "-${_build}")
@@ -770,7 +765,6 @@ macro(deploy_target _T)
 			COMMAND mkdir ${_VERB} -p "${_AGD}/DEBIAN"
 			${_CMD_}

-			#COMMAND  -l "${CMAKE_LDD}" -P xcb -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib;${_add_search_path}\"" -o ${_AGD}/usr/lib -p ${_AGD}/usr/ ${_AGD}/Contents/MacOS/${_T}
 			# generate deb
 			COMMAND cd ${_AGD} "&&" md5deep -rl opt usr ">" DEBIAN/md5sums
 			COMMAND mkdir ${_VERB} -p ${_DESTINATION}
@@ -826,7 +820,6 @@ macro(deploy_target _T)
 				${_CMD_}

 				# generate deb
-				#COMMAND cd ${_AGD} "&&" md5deep -rl * ">" DEBIAN/md5sums
 				COMMAND mkdir ${_VERB} -p ${_DESTINATION}
 				COMMAND dpkg-deb -Z gzip -b ${_AGD} ${_DESTINATION}/${_deb_name}
 				VERBATIM
@@ -893,13 +886,8 @@ macro(deploy_target _T)
 		endif()
 		set(_dmg_name "${_TV}_macosx_x64.dmg")
 		set(_cmd_gen_dmg COMMAND genisoimage -quiet -V "${MACOSX_BUNDLE_BUNDLE_NAME}" -D -R -apple -no-pad -o ${_DESTINATION}/${_dmg_name} ${_DMG})
-		#set(_cmd_int)
 		if (__mac_host)
 			set(_cmd_gen_dmg COMMAND hdiutil create ${_DESTINATION}/${_dmg_name} -ov -volname "${MACOSX_BUNDLE_BUNDLE_NAME}" -fs HFS+ -srcfolder ${_DMG})
-			#set(_rpathes "@executable_path/../Frameworks" "@executable_path/lib" "@loader_path/../lib")
-			#foreach (_r ${_rpathes})
-			#	set(_cmd_int ${_cmd_int} COMMAND install_name_tool -add_rpath "${_r}" \"${_AGD}/Contents/MacOS/${_T}\")
-			#endforeach()
 		endif()
 		if (_ZIP_DMG)
 			set(_cmd_gen_dmg ${_cmd_gen_dmg} COMMAND zip -q -r "\"${_DESTINATION}/${_dmg_name}.zip\"" "\"${_DESTINATION}/${_dmg_name}\"")
@@ -915,10 +903,7 @@ macro(deploy_target _T)
 			COMMAND mkdir ${_VERB} -p ${_AGD}/Contents/Frameworks
 			COMMAND mkdir ${_VERB} -p ${_DESTINATION}
 			${_CMD_}
-			#COMMAND cp ${_ICON_FN} ${_AGD}/Contents/Resources
-			#COMMAND cp -r ${_DEPLOY_DIR}/lang ${_AGD}/Contents/Resources
 			COMMAND ${PIP_DEPLOY_TOOL} ${_VERB} ${_OPTIONS} -M "${CMAKE_OTOOL}" -P cocoa,minimal -S mac -q ${Qt5_ROOT} -s "\"${CMAKE_PREFIX_PATH}/lib${_add_search_path}\"" -o ${_AGD}/Contents/Frameworks -p ${_AGD}/Contents/PlugIns ${_AGD}/Contents/MacOS/${_T} ${_ADD_DEPS}
-			#${_cmd_int}
 			# prepare dmg dir
 			COMMAND rm -rf ${_DMG}
 			COMMAND mkdir ${_VERB} -p ${_DMG}
@@ -949,8 +934,6 @@ macro(deploy_target _T)
 		endforeach()
 		set(_res_qrc "${CMAKE_CURRENT_BINARY_DIR}/android_res.qrc")
 		file(WRITE "${_res_qrc}" "<RCC>${_res_files}\n</RCC>")
-		#__make_copy(_CMD_ _RES_DIRS  _RES_FILES  "${_AGD}/res")
-		#__make_copy(_CMD_ _FILE_DIRS _FILE_FILES "${_AGD}/Contents/MacOS")
 		set(_AT ${_T}_lib)
 		set(_ATA ${_AT}_${ANDROID_ABI})
 		get_target_property(_sources ${_T} SOURCES)
@@ -976,9 +959,7 @@ macro(deploy_target _T)
 		set(_file "${Qt5_ROOT}/src/3rdparty/gradle/gradlew"
 				  "${Qt5_ROOT}/src/3rdparty/gradle/gradlew.bat")
 		__make_copy(_CMD_ _dir _file "${_AGD}")
-		#__make_copy(_CMD_ _PLUG_DIRS _PLUG_FILES "${_AGD}/")
 		#message("bindir = ${CMAKE_CURRENT_SOURCE_DIR}")
-		#get_target_property(_LL ${_T} )
 		set(SDK_ROOT "$ENV{ANDROID_SDK_ROOT}")
 		if("x${SDK_ROOT}" STREQUAL "x")
 			set(SDK_ROOT "$ENV{ANDROID_HOME}")
@@ -1059,7 +1040,6 @@ macro(deploy_target _T)
 		if (NOT __win_host)
 			set(_gradle_home "-g" "${CMAKE_BINARY_DIR}")
 		endif()
-		#set(_CMD_ ${_CMD_} COMMAND "${SDK_ROOT}/tools/android" update project --path "\"${_AGD}\"" --target android-${ANDROID_TARGET_SDK} --name QtApp)
 		set(_CMD_ ${_CMD_} COMMAND "${Qt5_BIN}/androiddeployqt" --aux-mode --android-platform ${ANDROID_PLATFORM} --output "\"${_AGD}\"" --input "\"${_out_json}\"")
 		set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" assembleDebug)
 		set(_CMD_ ${_CMD_} COMMAND "${_AGD}/gradlew" ${_gradle_home} --no-daemon -p "\"${_AGD}\"" bundleRelease)
--- a/cmake/DownloadGTest.cmake
+++ b/cmake/DownloadGTest.cmake
@@ -1,16 +1,16 @@
 # Download and unpack googletest at configure time
 configure_file(GTestCMakeLists.txt.in googletest-download/CMakeLists.txt)
 execute_process(COMMAND ${CMAKE_COMMAND} -G "${CMAKE_GENERATOR}" .
-        RESULT_VARIABLE result
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
+	RESULT_VARIABLE result
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
 if(result)
-    message(FATAL_ERROR "CMake step for googletest failed: ${result}")
+	message(FATAL_ERROR "CMake step for googletest failed: ${result}")
 endif()
 execute_process(COMMAND ${CMAKE_COMMAND} --build .
-        RESULT_VARIABLE result
-        WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
+	RESULT_VARIABLE result
+	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/googletest-download )
 if(result)
-    message(FATAL_ERROR "Build step for googletest failed: ${result}")
+	message(FATAL_ERROR "Build step for googletest failed: ${result}")
 endif()

 # Prevent overriding the parent project's compiler/linker
@@ -20,12 +20,12 @@ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 # Add googletest directly to our build. This defines
 # the gtest and gtest_main targets.
 add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/googletest-src
-        ${CMAKE_CURRENT_BINARY_DIR}/googletest-build
-        EXCLUDE_FROM_ALL)
+	${CMAKE_CURRENT_BINARY_DIR}/googletest-build
+	EXCLUDE_FROM_ALL)

 # The gtest/gtest_main targets carry header search path
 # dependencies automatically when using CMake 2.8.11 or
 # later. Otherwise we have to add them here ourselves.
 if (CMAKE_VERSION VERSION_LESS 2.8.11)
-    include_directories("${gtest_SOURCE_DIR}/include")
-endif()
+	include_directories("${gtest_SOURCE_DIR}/include")
+endif()
--- a/cmake/FindMinGW.cmake
+++ b/cmake/FindMinGW.cmake
@@ -12,7 +12,6 @@ if(${MINGW})
 		PATH_SUFFIXES
 			include)
 		#message(STATUS "Find MinGW  = ${MINGW_INCLUDE}")
-		#if(NOT ${MINGW_INCLUDE}) MINGW_INCLUDE = ${MINGW_DIR}/include
 		find_library(MINGW_LIB m HINTS ${MINGW_BIN}/../lib ${MINGW_INCLUDE}/../lib)
 		get_filename_component(MINGW_LIB ${MINGW_LIB} PATH)
 		if (NOT _MGW_MSG)
--- a/cmake/FindPIP.cmake
+++ b/cmake/FindPIP.cmake
@@ -16,7 +16,6 @@ main library
 ]]

 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
-#set(_PIP_MODULES pip pip_usb pip_crypt pip_fftw)
 if(WIN32)
 	find_package(MinGW REQUIRED)
 endif()
@@ -33,10 +32,6 @@ endif()
 if(CMAKE_CROSSCOMPILING)
 	list(APPEND _PIP_INCDIR "${CMAKE_PREFIX_PATH}/include/pip")
 	list(APPEND _PIP_LIBDIR "${CMAKE_PREFIX_PATH}/lib")
-	#if (DEFINED ANDROID_PLATFORM)
-	#	list(APPEND _PIP_INCDIR ${CMAKE_PREFIX_PATH}/include/pip)
-	#	list(APPEND _PIP_LIBDIR ${CMAKE_PREFIX_PATH}/lib)
-	#endif()
 else()
 	if(NOT WIN32)
 		list(APPEND _PIP_INCDIR "/usr/include/pip" "/usr/local/include/pip")
@@ -60,9 +55,6 @@ else()
 endif()
 list(APPEND _PIP_BINDIR "${PIP_DIR}/bin")
 set(_pip_suffix "")
-#if(DEFINED ANDROID_PLATFORM)
-#	set(_pip_suffix "_${ANDROID_ABI}")
-#endif()

 find_library(PIP_LIBRARY pip${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_USB_LIBRARY pip_usb${_pip_suffix} HINTS ${_PIP_LIBDIR})
@@ -73,11 +65,7 @@ find_library(PIP_IO_UTILS_LIBRARY pip_io_utils${_pip_suffix} HINTS ${_PIP_LIBDIR
 find_library(PIP_CONCURRENT_LIBRARY pip_concurrent${_pip_suffix} HINTS ${_PIP_LIBDIR})
 find_library(PIP_CLOUD_LIBRARY pip_cloud HINTS${_pip_suffix} ${_PIP_LIBDIR})
 find_file(PIP_H_INCLUDE "pip.h" HINTS ${_PIP_INCDIR} $ENV{SMSDK_DIR}/include/pip)
-#if (DEFINED ANDROID_PLATFORM)
-#	set(PIP_INCLUDES ${ANDROID_SYSTEM_LIBRARY_PATH}/usr/include/pip)
-#else()
-	get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
-#endif()
+get_filename_component(PIP_INCLUDES ${PIP_H_INCLUDE} PATH)
 set(__ext "")
 if ("x${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "xWindows")
 	set(__ext ".exe")
--- a/cmake/PIPMacros.cmake
+++ b/cmake/PIPMacros.cmake
@@ -86,17 +86,11 @@ macro(pip_resources RESULT INPUT)
 	set(RC_OUT ${CMAKE_CURRENT_BINARY_DIR}/${RC_FILE})
 	set(${RESULT} ${${RESULT}} ${RC_OUT})
 	set(CCM_FILES)
-	#if (ABS)
 	if(IS_ABSOLUTE "${INPUT}")
 		set(RC_FILES "${INPUT}")
 	else()
 		set(RC_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${INPUT}")
 	endif()
-	#else()
-	#	foreach(csrc ${CCM_SRC})
-	#		list(APPEND CCM_FILES "${CMAKE_CURRENT_SOURCE_DIR}/${csrc}")
-	#	endforeach()
-	#endif()
 	#message(STATUS "CCM = ${RESULT}")
 	if(NOT DEFINED PIP_DLL_DIR)
 		set(PIP_DLL_DIR ${CMAKE_CURRENT_BINARY_DIR})