Browse Source

Z991239-5337 #comment 框架编译通过

80374374 1 year ago
parent
commit
69173e0ab0

+ 29 - 0
Framework/CMakeLists.txt

@@ -1,5 +1,34 @@
 set(RVC_CONAN_DEP_LIBS2)
 
+set(KYSM_LIBRARY_NAME ${CONAN_LIBS_LIBKYSM})
+set(OPENSSL_INCLUDE_DIR ${CONAN_INCLUDE_DIRS_OPENSSL})
+set(OPENSSL_LIB_DIR ${CONAN_LIB_DIRS_OPENSSL})
+message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
+message(STATUS "CONAN_LIBS: ${CONAN_LIBS}")
+link_directories(${OPENSSL_LIB_DIR})
+set(OPENSSL_FOUND TRUE)
+include_directories(${OPENSSL_INCLUDE_DIR})
+set(OPENSSL_VERSION "1.1.1g")
+if(MSVC)
+	set(OPENSSL_SSL_LIBRARY libssl-1_1) # 
+	set(OPENSSL_CRYPTO_LIBRARY libcrypto-1_1)
+else()
+	set(OPENSSL_SSL_LIBRARY ssl)
+	set(OPENSSL_CRYPTO_LIBRARY crypto)
+endif(MSVC)
+set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARY} ${OPENSSL_CRYPTO_LIBRARY})
+
+
+add_definitions("-DWITH_OPENSSL")
+add_definitions("-DHAVE_CONFIG_H")
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/buildflags.h)
+# Include directories
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+# WinPR
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/winpr/include")
+include_directories("${CMAKE_CURRENT_BINARY_DIR}/winpr/include")
+
 include_directories(Common)
 add_subdirectory(winpr)
 add_subdirectory(RvcRestfulSdk)

+ 2 - 2
Framework/RVCComm/CMakeLists.txt

@@ -25,7 +25,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
 	${CONAN_INCLUDE_DIRS_LIBKYSM} 
 	${CONAN_INCLUDE_DIRS_CURL} 
 	${CONAN_INCLUDE_DIRS_JSONCPP}
-	${PROJECT_SOURCE_DIR}/libtoolkit
+	${RVC_TOOLKIT_INCLUDE_DIR}
 )
 target_link_directories(${MODULE_NAME} PRIVATE 
 	${CONAN_LIB_DIRS_LIBKYSM} 
@@ -53,7 +53,7 @@ if (BUILD_TESTING)
 	${CONAN_INCLUDE_DIRS_LIBKYSM} 
 	${CONAN_INCLUDE_DIRS_CURL} 
 	${CONAN_INCLUDE_DIRS_JSONCPP}
-	${PROJECT_SOURCE_DIR}/libtoolkit
+	${RVC_TOOLKIT_INCLUDE_DIR}
 	)
 	message(STATUS "openssl library: ${OPENSSL_SSL_LIBRARY}")
 	target_link_directories(${MODULE_NAME}_a PRIVATE 

+ 3 - 3
Framework/RvcLogSdk/CMakeLists.txt

@@ -13,7 +13,7 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3
     ${CONAN_INCLUDE_DIRS_LIBKYSM}
     ${CONAN_INCLUDE_DIRS_JSONCPP}
-    ${CMAKE_SOURCE_DIR}/ThirdParty/RvcRestfulSdk
+    ${RVCFRAMEWORK_SOURCES_DIR}/RvcRestfulSdk
     ${CMAKE_SOURCE_DIR}/ThirdParty/Include/cJSON
     ${CONAN_INCLUDE_DIRS_ZLIB}
     ${CONAN_INCLUDE_DIRS_OPENSSL}
@@ -30,8 +30,8 @@ target_include_directories(${MODULE_NAME} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3
     ${CONAN_INCLUDE_DIRS_LIBKYSM}
     ${CONAN_INCLUDE_DIRS_JSONCPP}
-    ${CMAKE_SOURCE_DIR}/ThirdParty/RvcRestfulSdk
-    ${CMAKE_SOURCE_DIR}/ThirdParty/cJSON
+    ${RVCFRAMEWORK_SOURCES_DIR}/RvcRestfulSdk
+    ${CMAKE_SOURCE_DIR}/ThirdParty/Include/cJSON
     ${CONAN_INCLUDE_DIRS_ZLIB}
 )
 target_link_directories(${MODULE_NAME} PRIVATE 

+ 11 - 0
Framework/buildflags.h.in

@@ -0,0 +1,11 @@
+#ifndef RVC_BUILD_FLAGS_H
+#define RVC_BUILD_FLAGS_H
+
+#define CFLAGS "${CMAKE_C_FLAGS}"
+#define COMPILER_ID "${CMAKE_C_COMPILER_ID}"
+#define COMPILER_VERSION "${CMAKE_C_COMPILER_VERSION}"
+#define TARGET_ARCH "${TARGET_ARCH}"
+#define BUILD_CONFIG "${RVC_BUILD_CONFIG}"
+#define BUILD_TYPE "${CMAKE_BUILD_TYPE}"
+
+#endif /* RVC_BUILD_FLAGS_H */

+ 177 - 0
Framework/config.h.in

@@ -0,0 +1,177 @@
+#ifndef RVC_CONFIG_H
+#define RVC_CONFIG_H
+
+/* Include files */
+#cmakedefine HAVE_FCNTL_H
+#if defined(__APPLE__) && !defined(__IOS__)
+#cmakedefine01 HAVE_UNISTD_H
+#else
+#cmakedefine HAVE_UNISTD_H
+#endif
+#cmakedefine HAVE_INTTYPES_H
+#cmakedefine HAVE_SYS_MODEM_H
+#cmakedefine HAVE_SYS_FILIO_H
+#cmakedefine HAVE_SYS_SELECT_H
+#cmakedefine HAVE_SYS_SOCKIO_H
+#cmakedefine HAVE_SYS_STRTIO_H
+#cmakedefine HAVE_SYS_EVENTFD_H
+#cmakedefine HAVE_SYS_TIMERFD_H
+#cmakedefine HAVE_TM_GMTOFF
+#cmakedefine HAVE_AIO_H
+#cmakedefine HAVE_POLL_H
+#cmakedefine HAVE_SYSLOG_H
+#cmakedefine HAVE_JOURNALD_H
+#cmakedefine HAVE_PTHREAD_MUTEX_TIMEDLOCK
+#cmakedefine HAVE_VALGRIND_MEMCHECK_H
+#cmakedefine HAVE_EXECINFO_H
+
+/* Features */
+#cmakedefine HAVE_ALIGNED_REQUIRED
+#cmakedefine SWRESAMPLE_FOUND
+#cmakedefine AVRESAMPLE_FOUND
+
+/* Options */
+#cmakedefine WITH_PROFILER
+#cmakedefine WITH_GPROF
+#cmakedefine WITH_SSE2
+#cmakedefine WITH_NEON
+#cmakedefine WITH_IPP
+#cmakedefine WITH_CUPS
+#cmakedefine WITH_NATIVE_SSPI
+#cmakedefine WITH_JPEG
+#cmakedefine WITH_WIN8
+#cmakedefine WITH_ICU
+#cmakedefine WITH_RDPSND_DSOUND
+#cmakedefine WITH_EVENTFD_READ_WRITE
+#cmakedefine HAVE_MATH_C99_LONG_DOUBLE
+
+#cmakedefine WITH_GSTREAMER_1_0
+#cmakedefine WITH_GSTREAMER_0_10
+#cmakedefine WITH_WINMM
+#cmakedefine WITH_MACAUDIO
+#cmakedefine WITH_OSS
+#cmakedefine WITH_ALSA
+#cmakedefine WITH_PULSE
+#cmakedefine WITH_IOSAUDIO
+#cmakedefine WITH_OPENSLES
+#cmakedefine WITH_GSM
+#cmakedefine WITH_LAME
+#cmakedefine WITH_FAAD2
+#cmakedefine WITH_FAAC
+#cmakedefine WITH_SOXR
+#cmakedefine WITH_GFX_H264
+#cmakedefine WITH_OPENH264
+#cmakedefine WITH_OPENH264_LOADING
+#cmakedefine WITH_FFMPEG
+#cmakedefine WITH_DSP_EXPERIMENTAL
+#cmakedefine WITH_DSP_FFMPEG
+#cmakedefine WITH_X264
+#cmakedefine WITH_OPENCL
+#cmakedefine WITH_MEDIA_FOUNDATION
+
+#cmakedefine WITH_VAAPI
+
+/* Plugins */
+#cmakedefine BUILTIN_CHANNELS
+#cmakedefine WITH_RDPDR
+
+/* Channels */
+#cmakedefine CHANNEL_AUDIN
+#cmakedefine CHANNEL_AUDIN_CLIENT
+#cmakedefine CHANNEL_AUDIN_SERVER
+#cmakedefine CHANNEL_CLIPRDR
+#cmakedefine CHANNEL_CLIPRDR_CLIENT
+#cmakedefine CHANNEL_CLIPRDR_SERVER
+#cmakedefine CHANNEL_DISP
+#cmakedefine CHANNEL_DISP_CLIENT
+#cmakedefine CHANNEL_DISP_SERVER
+#cmakedefine CHANNEL_DRDYNVC
+#cmakedefine CHANNEL_DRDYNVC_CLIENT
+#cmakedefine CHANNEL_DRDYNVC_SERVER
+#cmakedefine CHANNEL_DRIVE
+#cmakedefine CHANNEL_DRIVE_CLIENT
+#cmakedefine CHANNEL_DRIVE_SERVER
+#cmakedefine CHANNEL_ECHO
+#cmakedefine CHANNEL_ECHO_CLIENT
+#cmakedefine CHANNEL_ECHO_SERVER
+#cmakedefine CHANNEL_ENCOMSP
+#cmakedefine CHANNEL_ENCOMSP_CLIENT
+#cmakedefine CHANNEL_ENCOMSP_SERVER
+#cmakedefine CHANNEL_PARALLEL
+#cmakedefine CHANNEL_PARALLEL_CLIENT
+#cmakedefine CHANNEL_PARALLEL_SERVER
+#cmakedefine CHANNEL_PRINTER
+#cmakedefine CHANNEL_PRINTER_CLIENT
+#cmakedefine CHANNEL_PRINTER_SERVER
+#cmakedefine CHANNEL_RAIL
+#cmakedefine CHANNEL_RAIL_CLIENT
+#cmakedefine CHANNEL_RAIL_SERVER
+#cmakedefine CHANNEL_RDPDR
+#cmakedefine CHANNEL_RDPDR_CLIENT
+#cmakedefine CHANNEL_RDPDR_SERVER
+#cmakedefine CHANNEL_RDPEI
+#cmakedefine CHANNEL_RDPEI_CLIENT
+#cmakedefine CHANNEL_RDPEI_SERVER
+#cmakedefine CHANNEL_RDPGFX
+#cmakedefine CHANNEL_RDPGFX_CLIENT
+#cmakedefine CHANNEL_RDPGFX_SERVER
+#cmakedefine CHANNEL_RDPSND
+#cmakedefine CHANNEL_RDPSND_CLIENT
+#cmakedefine CHANNEL_RDPSND_SERVER
+#cmakedefine CHANNEL_REMDESK
+#cmakedefine CHANNEL_REMDESK_CLIENT
+#cmakedefine CHANNEL_REMDESK_SERVER
+#cmakedefine CHANNEL_SERIAL
+#cmakedefine CHANNEL_SERIAL_CLIENT
+#cmakedefine CHANNEL_SERIAL_SERVER
+#cmakedefine CHANNEL_SMARTCARD
+#cmakedefine CHANNEL_SMARTCARD_CLIENT
+#cmakedefine CHANNEL_SMARTCARD_SERVER
+#cmakedefine CHANNEL_SSHAGENT
+#cmakedefine CHANNEL_SSHAGENT_CLIENT
+#cmakedefine CHANNEL_SSHAGENT_SERVER
+#cmakedefine CHANNEL_TSMF
+#cmakedefine CHANNEL_TSMF_CLIENT
+#cmakedefine CHANNEL_TSMF_SERVER
+#cmakedefine CHANNEL_URBDRC
+#cmakedefine CHANNEL_URBDRC_CLIENT
+#cmakedefine CHANNEL_URBDRC_SERVER
+
+/* Debug */
+#cmakedefine WITH_DEBUG_CERTIFICATE
+#cmakedefine WITH_DEBUG_CAPABILITIES
+#cmakedefine WITH_DEBUG_CHANNELS
+#cmakedefine WITH_DEBUG_CLIPRDR
+#cmakedefine WITH_DEBUG_RDPGFX
+#cmakedefine WITH_DEBUG_DVC
+#cmakedefine WITH_DEBUG_TSMF
+#cmakedefine WITH_DEBUG_KBD
+#cmakedefine WITH_DEBUG_LICENSE
+#cmakedefine WITH_DEBUG_NEGO
+#cmakedefine WITH_DEBUG_NLA
+#cmakedefine WITH_DEBUG_NTLM
+#cmakedefine WITH_DEBUG_TSG
+#cmakedefine WITH_DEBUG_RAIL
+#cmakedefine WITH_DEBUG_RDP
+#cmakedefine WITH_DEBUG_REDIR
+#cmakedefine WITH_DEBUG_RDPDR
+#cmakedefine WITH_DEBUG_RFX
+#cmakedefine WITH_DEBUG_SCARD
+#cmakedefine WITH_DEBUG_SND
+#cmakedefine WITH_DEBUG_SVC
+#cmakedefine WITH_DEBUG_RDPEI
+#cmakedefine WITH_DEBUG_TIMEZONE
+#cmakedefine WITH_DEBUG_THREADS
+#cmakedefine WITH_DEBUG_MUTEX
+#cmakedefine WITH_DEBUG_TRANSPORT
+#cmakedefine WITH_DEBUG_WND
+#cmakedefine WITH_DEBUG_X11
+#cmakedefine WITH_DEBUG_X11_CLIPRDR
+#cmakedefine WITH_DEBUG_X11_LOCAL_MOVESIZE
+#cmakedefine WITH_DEBUG_XV
+#cmakedefine WITH_DEBUG_RINGBUFFER
+
+/* Proxy */
+#cmakedefine WITH_PROXY_MODULES
+
+#endif /* RVC_CONFIG_H */

+ 8 - 25
Framework/spbase/CMakeLists.txt

@@ -1,22 +1,6 @@
 set(MODULE_NAME "spbase")
 set(MODULE_PREFIX "SPBASE")
 
-if(NOT CONAN_EXPORTED)
-    if(NOT CONAN_INCLUDE_DIRS_JSONCPP)
-    #TODO: 将Json辅助类拆分,避免每次引用这个类时就必须链接CPPJson库
-    if(MSVC)
-        conan_cmake_run(REQUIRES 
-            jsoncpp/0.10.0@LR04.02_ThirdParty/testing
-	        BASIC_SETUP CMAKE_TARGETS)
-    else()
-        conan_cmake_run(REQUIRES 
-            jsoncpp/1.9.0@LR04.02_ThirdParty/stable
-	        BASIC_SETUP CMAKE_TARGETS)
-    endif(MSVC)
-
-    endif(NOT CONAN_INCLUDE_DIRS_JSONCPP)
-endif(NOT CONAN_EXPORTED)
-
 file(GLOB ${MODULE_PREFIX}_SRCS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.h" "*.cpp" "*.c")
 
 list(REMOVE_ITEM ${MODULE_PREFIX}_SRCS
@@ -25,7 +9,6 @@ list(REMOVE_ITEM ${MODULE_PREFIX}_SRCS
     "testInherits.cpp"
     "Console.h"
     "Console.cpp"
-
     "sp_hcc.h" # no used anywhere
     "sp_hcc.c"
     )
@@ -79,12 +62,12 @@ add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 set_target_properties(${MODULE_NAME} PROPERTIES DEBUG_POSTFIX "d")
 
 target_include_directories(${MODULE_NAME} PRIVATE
-    ${CMAKE_SOURCE_DIR}/Common
-    ${CMAKE_SOURCE_DIR}/libtoolkit
+    ${RVC_COMMON_INCLUDE_DIR}
+    ${RVC_TOOLKIT_INCLUDE_DIR}
     ${CMAKE_CURRENT_BINARY_DIR}
     ${CONAN_INCLUDE_DIRS_JSONCPP}
-    ${CMAKE_SOURCE_DIR}/ThirdParty/RvcLogSdk
-    ${CMAKE_SOURCE_DIR}/ThirdParty/RvcRestfulSdk
+    ${RVCFRAMEWORK_SOURCES_DIR}/RvcLogSdk
+    ${RVCFRAMEWORK_SOURCES_DIR}/RvcRestfulSdk
     )
 target_link_directories(${MODULE_NAME} PRIVATE 
 	${CONAN_LIB_DIRS_JSONCPP}
@@ -103,12 +86,12 @@ target_link_libraries(${MODULE_NAME} PRIVATE
 if (BUILD_TESTING)
     add_library(${MODULE_NAME}_a STATIC ${${MODULE_PREFIX}_SRCS})
     target_include_directories(${MODULE_NAME}_a PRIVATE
-        ${CMAKE_SOURCE_DIR}/Common
-        ${CMAKE_SOURCE_DIR}/libtoolkit
+        ${RVC_COMMON_INCLUDE_DIR}
+        ${RVC_TOOLKIT_INCLUDE_DIR}
         ${CMAKE_CURRENT_BINARY_DIR}
         ${CONAN_INCLUDE_DIRS_JSONCPP}/json
-        ${CMAKE_SOURCE_DIR}/ThirdParty/RvcLogSdk
-        ${CMAKE_SOURCE_DIR}/ThirdParty/RvcRestfulSdk
+        ${RVCFRAMEWORK_SOURCES_DIR}/RvcLogSdk
+        ${RVCFRAMEWORK_SOURCES_DIR}/RvcRestfulSdk
     )
     target_link_directories(${MODULE_NAME}_a PRIVATE 
 	    ${CONAN_LIB_DIRS_JSONCPP}

+ 2 - 2
Framework/sphost/CMakeLists.txt

@@ -15,8 +15,8 @@ endif(MSVC)
 
 list(APPEND ${MODULE_PREFIX}_SRCS "../Common/precompile.c")
 
-include_directories(${PROJECT_SOURCE_DIR}/spbase)
-include_directories(${PROJECT_SOURCE_DIR}/libtoolkit)
+include_directories(${RVCFRAMEWORK_SOURCES_DIR}/spbase)
+include_directories(${RVCFRAMEWORK_SOURCES_DIR}/libtoolkit)
 
 set(SPSHOT_VERSION_STRING "1.0.1-dev1")
 rvc_set_win_dll_ver(${MODULE_PREFIX} ${SPSHOT_VERSION_STRING})

+ 3 - 3
Framework/spshell/CMakeLists.txt

@@ -64,9 +64,9 @@ if (WIN32)
 	set (${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif()
 
-include_directories(${PROJECT_SOURCE_DIR})
-include_directories(${PROJECT_SOURCE_DIR}/spbase)
-include_directories(${PROJECT_SOURCE_DIR}/libtoolkit)
+include_directories(${RVCFRAMEWORK_SOURCES_DIR})
+include_directories(${RVCFRAMEWORK_SOURCES_DIR}/spbase)
+include_directories(${RVCFRAMEWORK_SOURCES_DIR}/libtoolkit)
 
 if(WITH_QT_GUI)
 

+ 6 - 10
addin/cmake/BuildMakeSettings.cmake

@@ -1,18 +1,14 @@
-SET(RVC_COMMON_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/Common)
-SET(RVC_TOOLKIT_INCLUDE_DIR ${CONAN_RVCFRAMEWORK_ROOT}/include/libtoolkit)
+SET(RVCFRAMEWORK_SOURCES_DIR ${PROJECT_SOURCE_DIR}/Framework)
+SET(RVC_COMMON_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/Common)
+SET(RVC_TOOLKIT_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/libtoolkit)
+SET(RVC_WINPR_INCLUDE_DIR ${RVCFRAMEWORK_SOURCES_DIR}/winpr/include)
+SET(RVC_FRAMEWORK_INCLUDES_DIR ${RVC_COMMON_INCLUDE_DIR} 
+    ${RVC_TOOLKIT_INCLUDE_DIR} ${RVC_WINPR_INCLUDE_DIR})
 
-# <ThirdPartyLib>$(MSBuildProjectDirectory)\..\..\ThirdParty\Release</ThirdPartyLib>
 SET(ThirdPartyLib "${PROJECT_SOURCE_DIR}/ThirdParty/Release")
 
-# <ThirdPartyHeadRoot>$(MSBuildProjectDirectory)\..\..\ThirdParty\Include</ThirdPartyHeadRoot>
 SET(ThirdPartyHeadRoot "${PROJECT_SOURCE_DIR}/ThirdParty/Include")
 
-# <FrameworkLib>$(MSBuildProjectDirectory)\..\..\Framework\Release</FrameworkLib>
-#SET(FrameworkLib "${PROJECT_SOURCE_DIR}/third_party")
-
-# <FrameworkHeadRoot>$(MSBuildProjectDirectory)\..\..\Framework\Include</ThirdPartyHeadRoot>
-#SET(FrameworkHeadRoot "${PROJECT_SOURCE_DIR}/third_party")
-
 macro(rvc_set_library_output_dir _dir)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${_dir})
 	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${_dir})

+ 3 - 1
addin/cmake/ConfigOptions.cmake

@@ -54,4 +54,6 @@ option(WITH_UPDATE_CHANGELOG "scheduling producting changelog html format result
 
 option(WITH_UNAUTHORIZED_RES "download other resource file or for skipping big file mechanism like hardware driver" OFF)
 
-option(DEVOPS_INSTALL_SWITCH "install at devpos for pkging as zip easily" OFF)
+option(DEVOPS_INSTALL_SWITCH "install at devpos for pkging as zip easily" OFF)
+
+option(WITH_QT_GUI "build the qt gui display" OFF)

+ 14 - 5
addin/cmake/DependencyConanFiles.cmake

@@ -7,6 +7,8 @@
 #conan upload log4cplus/1.2.1@LR04.02_ThirdParty/stable --all -r=conan-cmb
 
 set(CONAN_ALLPLATFORM_LIB_NAMES
+	#libpublicFun
+	openssl/1.1.1g@LR04.02_ThirdParty/stable
 	#mod_sipphone libwmvrecord libaudioframwork mod_mediacontroller libaudiorender
 	SpeexDSP/1.2rc3@LR04.02_ThirdParty/testing 
 	#libaudioframwork
@@ -18,17 +20,23 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	#jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!
 	#mod_chromium
 	#cefclient_mutable/3.0@LR04.02_ThirdParty/testing
-	#mod_chromium mod_RomoteController mod_rpc
+	#mod_chromium mod_RomoteController RvcRestfulSdk
 	boost/1.69.0@LR04.02_ThirdParty/testing
-
+	#RVCComm
+	libssh2/1.9.0@LR04.02_ThirdParty/testing
+	curl/7.76.1@LR04.02_ThirdParty/testing
+	cpprestsdk/2.10.15@LR04.02_ThirdParty/testing
 )
 
 if(MSVC)
 	set(CONAN_CURPLATFORM_LIB_NAMES
+			libkysm/1.12.0@LR04.02_ThirdParty/stable
+			#RVCLogSDK RVCComm
+			jsoncpp/0.10.0@LR04.02_ThirdParty/testing
 			#libbizchan mod_screenshot mod_snapshot
 			openjpeg/2.0.0@LR04.02_ThirdParty/msvc
 			#mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
-			#zlib/1.2.11@LR04.02_ThirdParty/vcpkg
+			zlib/1.2.11@LR04.02_ThirdParty/vcpkg
 			#mod_download mod_evtconverter mod_ThermalPrint
 			expat/2.1.0@LR04.02_ThirdParty/stable
 			#mod_ThermalPrint mod_evtconverter mod_download
@@ -75,10 +83,12 @@ if(MSVC)
 	list(APPEND CONAN_CURPLATFORM_LIB_NAMES RuntimeBase/2024.0401.02@LR04.02_ThirdParty/testing)
 else()
 	set(CONAN_CURPLATFORM_LIB_NAMES
+			libkysm/1.17.20201109@LR04.02_ThirdParty/testing
+			jsoncpp/1.9.0@LR04.02_ThirdParty/stable
 			#libbizchan mod_screenshot mod_snapshot
 			openjpeg/2.0.0@LR04.02_ThirdParty/testing
 			#mod_snapshot mod_screenshot mod_RomoteController mod_UpgradeRun mod_upload libscreencodec 
-			#zlib/1.2.11@LR04.02_ThirdParty/stable
+			zlib/1.2.11@LR04.02_ThirdParty/stable
 			#mod_download mod_evtconverter mod_ThermalPrint
 			expat/2.1.0@LR04.02_ThirdParty/testing
 			#mod_ThermalPrint mod_evtconverter mod_download
@@ -106,7 +116,6 @@ else()
 			log4cplus/1.2.1@LR04.02_ThirdParty/slim # !!!!support build missing!!!!
 			#mod_resourceWatcher
 			sogoulib/2021.1008.01@LR04.02_VendorLib/testing
-			cpprestsdk/2.10.15@LR04.02_ThirdParty/testing
 			#showdev mod_mediacontroller mod_sipphone libaudioframwork
 			spandsp/0.0.6@LR04.02_ThirdParty/testing
 			)

+ 20 - 0
addin/cmake/UOSToolchain.cmake

@@ -0,0 +1,20 @@
+# cmake script which sets up all the toolchain related variables
+# -DCMAKE_TOOLCHAIN_FILE=this_file_name.cmake 
+
+set(CMAKE_SYSTEM_NAME Linux) # UOS
+set(CMAKE_SYSTEM_PROCESSOR arm)
+#set(CMAKE_SYSTEMROOT)
+
+set(cross_compile_tools )
+set(CMAKE_C_COMPILER aarch64-linux-gnu-gcc-8)
+# if toolchains is a GNU toolchain, only need to set one of both
+set(CMAKE_CXX_COMPILER aarch64-linux-gnu-g++-8)
+
+# target library find path be prefixed with
+# set(CMAKE_FIND_ROOT_PATH )
+
+# set behaviour for find_program() cmd: never, only, both,refer to CMAKE_FIND_ROOT_PATH
+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)