Merge branch 'master' of https://git.shs.tools/SHS/pip

2022-08-08 17:14:21 +03:00
parent 724a2dffcf 616b384ad6
commit 60f4db61eb
9 changed files with 55 additions and 55 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,12 +1,12 @@
 cmake_minimum_required(VERSION 3.0)
 cmake_policy(SET CMP0017 NEW) # need include() with .cmake
-project(pip)
-set(pip_MAJOR    2)
-set(pip_MINOR    100)
-set(pip_REVISION 0)
-set(pip_SUFFIX   )
-set(pip_COMPANY  SHS)
-set(pip_DOMAIN   org.SHS)
+project(PIP)
+set(PIP_MAJOR    2)
+set(PIP_MINOR    100)
+set(PIP_REVISION 0)
+set(PIP_SUFFIX   )
+set(PIP_COMPANY  SHS)
+set(PIP_DOMAIN   org.SHS)

 set(GIT_CMAKE_DIR)
 if (NOT DEFINED SHSTKPROJECT)
@@ -53,7 +53,7 @@ include(CheckFunctionExists)
 include(PIPMacros)
 include(SHSTKMacros)

-shstk_begin_project(pip PIP)
+shstk_begin_project(PIP)

 set(_ICU_DEFAULT OFF)
 if((NOT DEFINED WIN32) AND (NOT DEFINED ANDROID_PLATFORM) AND (NOT DEFINED APPLE))
@@ -118,11 +118,11 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 	string(TOUPPER "${_target}" DEF_NAME)

 	set(PIP_MSG_${NAME} "yes${MSG}")
-	import_version(${_target} pip)
-	set_deploy_property(${_target} ${pip_LIB_TYPE}
+	import_version(${_target} PIP)
+	set_deploy_property(${_target} ${PIP_LIB_TYPE}
 		LABEL "${LABEL}"
-		FULLNAME "${pip_DOMAIN}.${_target}"
-		COMPANY  "${pip_COMPANY}"
+		FULLNAME "${PIP_DOMAIN}.${_target}"
+		COMPANY  "${PIP_COMPANY}"
 		INFO "Platform-Independent Primitives")
 	make_rc(${_target} _RC)

@@ -139,7 +139,7 @@ macro(pip_module NAME LIBS LABEL INCLUDES SOURCES MSG)
 		pip_resources(CRES "${RES}")
 	endif()
 	add_definitions(-D${DEF_NAME})
-	add_library(${_target} ${pip_LIB_TYPE} ${CPPS} ${CRES} ${_RC})
+	add_library(${_target} ${PIP_LIB_TYPE} ${CPPS} ${CRES} ${_RC})
 	target_include_directories(${_target} PUBLIC ${PIP_INCLUDES})
 	if (NOT "x${RES}" STREQUAL "x")
 		add_dependencies(${_target} pip_rc)
@@ -592,14 +592,14 @@ if ((NOT PIP_FREERTOS) AND (NOT CROSSTOOLS))
 			string(TOUPPER "${_m}" _mdef)
 			list(APPEND DOXY_DEFINES "PIP_${_mdef}_EXPORT")
 		endforeach()
-		set(DOXY_PROJECT_NUMBER "${pip_VERSION}")
-		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${pip_VERSION}\"")
-		set(DOXY_QHP_SECT_FILTER_ATTRS "\"PIP ${pip_VERSION}\"")
+		set(DOXY_PROJECT_NUMBER "${PIP_VERSION}")
+		set(DOXY_QHP_CUST_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
+		set(DOXY_QHP_SECT_FILTER_ATTRS "\"PIP ${PIP_VERSION}\"")
 		set(DOXY_EXAMPLE_PATH    "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/examples\"")
 		set(DOXY_IMAGE_PATH      "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/images\"")
 		set(DOXY_LOGO_PATH       "\"${CMAKE_CURRENT_SOURCE_DIR}/doc/pip.png\"")
 		set(DOXY_EXCLUDE         "\"${CMAKE_CURRENT_SOURCE_DIR}/libs/lua/3rd\"")
-		set(DOXY_DOMAIN "${pip_DOMAIN}.${PROJECT_NAME}.doc")
+		set(DOXY_DOMAIN "${PIP_DOMAIN}.${PROJECT_NAME}.doc")
 		if ("x${DOC_LANG}" STREQUAL "x")
 			set(DOXY_OUTPUT_LANGUAGE English)
 			set(DOXY_OUTPUT_DIR      en)
@@ -645,9 +645,9 @@ endmacro()

 list(REMOVE_ITEM LIBS_STATUS ${PIP_MODULES})
 message("----------PIP----------")
-message(" Version: ${pip_VERSION} ")
-message(" Linkage: ${pip_LIB_TYPE_MSG}")
-message(" Type   : ${pip_BUILD_TYPE}")
+message(" Version: ${PIP_VERSION} ")
+message(" Linkage: ${PIP_LIB_TYPE_MSG}")
+message(" Type   : ${PIP_BUILD_TYPE}")
 if (NOT LOCAL)
 	message(" Install: \"${CMAKE_INSTALL_PREFIX}\"")
 else()
--- a/cmake/FindPIP.cmake
+++ b/cmake/FindPIP.cmake
@@ -20,11 +20,11 @@ main library
 cmake_policy(SET CMP0011 NEW) # don`t affect includer policies
 include(SHSTKMacros)

-shstk_set_find_dirs(pip PIP)
+shstk_set_find_dirs(PIP)

 set(__libs "usb;crypt;console;fftw;compress;io_utils;opencl;cloud;lua")

-if (BUILDING_pip)
+if (BUILDING_PIP)
 	#set(_libs "pip;pip_usb;pip_console;pip_crypt;pip_fftw;pip_compress;pip_opencl;pip_io_utils;pip_cloud;pip_lua")
 	#set(_bins "pip_cmg;pip_rc;deploy_tool")
 	#get_target_property(_path pip BINARY_DIR)
@@ -35,20 +35,20 @@ if (BUILDING_pip)
 	
 	set(PIP_FOUND ON CACHE BOOL "")
 else()
-	find_library(PIP_LIBRARY pip HINTS ${pip_LIBDIR})
+	find_library(PIP_LIBRARY pip HINTS ${PIP_LIBDIR})
 	foreach (_l ${__libs})
-		find_library(PIP_LIBRARY_${_l} pip_${_l} HINTS ${pip_LIBDIR})
+		find_library(PIP_LIBRARY_${_l} pip_${_l} HINTS ${PIP_LIBDIR})
 	endforeach()
 endif()
 	
-if (BUILDING_pip AND (NOT CMAKE_CROSSCOMPILING))
+if (BUILDING_pPIP AND (NOT CMAKE_CROSSCOMPILING))
 	set(PIP_CMG          "$<TARGET_FILE_DIR:pip_cmg>/$<TARGET_FILE_NAME:pip_cmg>"          CACHE STRING "")
 	set(PIP_RC           "$<TARGET_FILE_DIR:pip_rc>/$<TARGET_FILE_NAME:pip_rc>"            CACHE STRING "")
 	set(PIP_DEPLOY_TOOL  "$<TARGET_FILE_DIR:deploy_tool>/$<TARGET_FILE_NAME:deploy_tool>"  CACHE STRING "")
 else()
-	find_program(PIP_CMG pip_cmg${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
-	find_program(PIP_RC pip_rc${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
-	find_program(PIP_DEPLOY_TOOL deploy_tool${pip_BINEXT} HINTS ${pip_BINDIR} ${pip_FIND_PROGRAM_ARG})
+	find_program(PIP_CMG pip_cmg${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
+	find_program(PIP_RC pip_rc${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
+	find_program(PIP_DEPLOY_TOOL deploy_tool${PIP_BINEXT} HINTS ${PIP_BINDIR} ${PIP_FIND_PROGRAM_ARG})
 endif()
 if (NOT PIP_LIBRARY)
 	if(PIP_FIND_REQUIRED)
@@ -58,7 +58,7 @@ if (NOT PIP_LIBRARY)
 endif()
 set(_PIP_LIBRARY_PATH_ "${PIP_LIBRARY}")
 set(_PIP_ADD_LIBS_ "")
-if (NOT BUILDING_pip)
+if (NOT BUILDING_PIP)
 	if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
 		find_library(DL_LIBRARY dl)
 		list(APPEND PIP_LIBRARY ${DL_LIBRARY})
@@ -75,9 +75,9 @@ if (NOT BUILDING_pip)
 	endif()
 endif()

-if (NOT BUILDING_pip)
-	shstk_find_header(pip PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
-	set(PIP_INCLUDES "${pip_INCLUDES}" CACHE STRING "")
+if (NOT BUILDING_PIP)
+	shstk_find_header(PIP "pip_version.h" "${_PIP_LIBRARY_PATH_}")
+	set(PIP_INCLUDES "${PIP_INCLUDES}" CACHE STRING "")
 endif()
 if(PIP_FIND_VERSION VERSION_GREATER PIP_VERSION)
 	message(FATAL_ERROR "PIP version ${PIP_VERSION} is available, but ${PIP_FIND_VERSION} requested!")
@@ -103,10 +103,10 @@ set(__deps_io_utils  "PIP::Crypt")
 set(__deps_cloud     "PIP::IOUtils")


-if (BUILDING_pip)
+if (BUILDING_PIP)

-	if (NOT SET_TARGETS_pip)
-		set(SET_TARGETS_pip ON CACHE BOOL "")
+	if (NOT SET_TARGETS_PIP)
+		set(SET_TARGETS_PIP ON CACHE BOOL "")
 		#message("create aliases")
 		if((NOT TARGET PIP) AND PIP_LIBRARY)
 			#message("alias PIP = pip")
@@ -128,7 +128,7 @@ else()
 		add_library(PIP UNKNOWN IMPORTED)
 		set_target_properties(PIP PROPERTIES
 			IMPORTED_LOCATION "${_PIP_LIBRARY_PATH_}"
-			INTERFACE_INCLUDE_DIRECTORIES "${pip_INCLUDES}"
+			INTERFACE_INCLUDE_DIRECTORIES "${PIP_INCLUDES}"
 			INTERFACE_LINK_LIBRARIES "${_PIP_ADD_LIBS_}")
 		#message("imported PIP = ${PIP_LIBRARY}")
 	endif()
--- a/libs/main/core/picout.cpp
+++ b/libs/main/core/picout.cpp
@@ -392,7 +392,7 @@ PICout & PICout::operator <<(float v) {if (!act_) return *this; space(); PIFLOAT

 PICout & PICout::operator <<(double v) {if (!act_) return *this; space(); PIFLOATCOUT(v)}

-PICout & PICout::operator <<(void * v) {
+PICout & PICout::operator <<(const void * v) {
 	if (!act_) return *this;
 	space();
 	write("0x" + PIString::fromNumber(ullong(v), 16));
--- a/libs/main/core/picout.h
+++ b/libs/main/core/picout.h
@@ -232,7 +232,7 @@ public:

 	//! \~english Output operator for pointers
 	//! \~russian Оператор вывода для указателей
-	PICout & operator <<(void * v);
+	PICout & operator <<(const void * v);

 	//! \~english Output operator for PIObject and ancestors
 	//! \~russian Оператор вывода для PIObject и наследников
--- a/utils/cloud_dispatcher/CMakeLists.txt
+++ b/utils/cloud_dispatcher/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(picloud)
-import_version(${PROJECT_NAME} pip)
+import_version(${PROJECT_NAME} PIP)
 set_deploy_property(${PROJECT_NAME}
 	LABEL "PIP Cloud dispatcher"
-	FULLNAME "${pip_DOMAIN}.picloud"
-	COMPANY "${pip_COMPANY}"
+	FULLNAME "${PIP_DOMAIN}.picloud"
+	COMPANY "${PIP_COMPANY}"
 	INFO "PIP Cloud dispatcher")
 make_rc(${PROJECT_NAME} RC)
 list(APPEND PIP_UTILS_LIST "picloud")
--- a/utils/code_model_generator/CMakeLists.txt
+++ b/utils/code_model_generator/CMakeLists.txt
@@ -1,10 +1,10 @@
 list(APPEND PIP_UTILS_LIST "pip_cmg")
 set(PIP_UTILS_LIST ${PIP_UTILS_LIST} PARENT_SCOPE)
-import_version(pip_cmg pip)
+import_version(pip_cmg PIP)
 set_deploy_property(pip_cmg
 	LABEL "PIP code model generator"
-	FULLNAME "${pip_DOMAIN}.pip_cmg"
-	COMPANY  "${pip_COMPANY}"
+	FULLNAME "${PIP_DOMAIN}.pip_cmg"
+	COMPANY  "${PIP_COMPANY}"
 	INFO "Platform-Independent Primitives")
 make_rc(pip_cmg _RC)
 add_executable(pip_cmg "main.cpp" ${_RC})
--- a/utils/deploy_tool/CMakeLists.txt
+++ b/utils/deploy_tool/CMakeLists.txt
@@ -1,10 +1,10 @@
 list(APPEND PIP_UTILS_LIST "deploy_tool")
 set(PIP_UTILS_LIST ${PIP_UTILS_LIST} PARENT_SCOPE)
-import_version(deploy_tool pip)
+import_version(deploy_tool PIP)
 set_deploy_property(deploy_tool
 	LABEL "PIP deploy tool"
-	FULLNAME "${pip_DOMAIN}.deploy_tool"
-	COMPANY  "${pip_COMPANY}"
+	FULLNAME "${PIP_DOMAIN}.deploy_tool"
+	COMPANY  "${PIP_COMPANY}"
 	INFO "Platform-Independent Primitives")
 make_rc(deploy_tool _RC)
 file(GLOB SRC "*.cpp" "*.h")
--- a/utils/resources_compiler/CMakeLists.txt
+++ b/utils/resources_compiler/CMakeLists.txt
@@ -1,10 +1,10 @@
 list(APPEND PIP_UTILS_LIST "pip_rc")
 set(PIP_UTILS_LIST ${PIP_UTILS_LIST} PARENT_SCOPE)
-import_version(pip_rc pip)
+import_version(pip_rc PIP)
 set_deploy_property(pip_rc
 	LABEL "PIP resources compiler"
-	FULLNAME "${pip_DOMAIN}.pip_rc"
-	COMPANY  "${pip_COMPANY}"
+	FULLNAME "${PIP_DOMAIN}.pip_rc"
+	COMPANY  "${PIP_COMPANY}"
 	INFO "Platform-Independent Primitives")
 make_rc(pip_rc _RC)
 file(GLOB SRC "*.cpp" "*.h")
--- a/utils/system_daemon/CMakeLists.txt
+++ b/utils/system_daemon/CMakeLists.txt
@@ -1,9 +1,9 @@
 project(pisd)
-import_version(${PROJECT_NAME} pip)
+import_version(${PROJECT_NAME} PIP)
 set_deploy_property(${PROJECT_NAME}
 	LABEL "PIP System Daemon"
-	FULLNAME "${pip_DOMAIN}.pisd"
-	COMPANY "${pip_COMPANY}"
+	FULLNAME "${PIP_DOMAIN}.pisd"
+	COMPANY  "${PIP_COMPANY}"
 	INFO "PIP System Daemon")
 make_rc(${PROJECT_NAME} RC)
 list(APPEND PIP_UTILS_LIST "pisd")