Z991239-678 #comment feature: 实体编译添加 conan 支持

CMakeLists.txt

@@ -146,6 +146,9 @@ BASIC_SETUP # CMAKE_TARGETS
 BUILD missing)
 
 set(RVC_CONAN_DEP_LIBS ${CONAN_BIN_DIRS})
+if(NOT MSVC)
+	set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${CONAN_LIB_DIRS})
+endif(NOT MSVC)
 
 set(CONAN_EXPORTED ${OLD_CONAN_EXPORTED})
 

Module/mod_cardswiper/CMakeLists.txt

@@ -19,9 +19,7 @@ set(${MODULE_PREFIX}_SRCS
 
 list(APPEND ${MODULE_PREFIX}_SRCS ${ALGORITHMS_SM})
 
-conan_cmake_run(REQUIRES openssl/1.1.1d@LR04.02_ThirdParty/stable
-BASIC_SETUP CMAKE_TARGETS
-BUILD missing)
+
 
 set(MOD_VERSION_STRING "1.0.0-dev1")
 
@@ -40,7 +38,11 @@ target_include_directories(${MODULE_NAME} PRIVATE
 set_target_properties(${MODULE_NAME} PROPERTIES COMPILE_DEFINITIONS "_CRT_RAND_S")
 
 # 添加实体需要依赖的其他共享库（包括系统库）
-set(${MODULE_PREFIX}_LIBS  CONAN_PKG::OpenSSL)
+if(MSVC)
+set(${MODULE_PREFIX}_LIBS  ssl-1_1)
+else()
+set(${MODULE_PREFIX}_LIBS  ssl)
+endif(MSVC)
 set(${MODULE_PREFIX}_SYSLIBS)
 if(MSVC)
 	list(APPEND ${MODULE_PREFIX}_SYSLIBS Ws2_32 Bthprops)

addin/cmake/conan.cmake

@@ -479,6 +479,7 @@ macro(conan_cmake_run)
 
     if(CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE AND NOT CONAN_EXPORTED
             AND NOT ARGUMENTS_BUILD_TYPE)
+        message(STATUS "Conan: set CONAN_CMAKE_MULTI on")
         set(CONAN_CMAKE_MULTI ON)
         if (NOT ARGUMENTS_CONFIGURATION_TYPES)
             set(ARGUMENTS_CONFIGURATION_TYPES "Release;Debug")

addin/startup_scripts/spexplorertest.sh

@@ -0,0 +1,59 @@
+#!/bin/sh
+MY_PATH="`dirname \"$0\"`"              # relative
+# echo "1"$MY_PATH
+MY_PATH="`( cd \"$MY_PATH\" && pwd )`"  # absolutized and normalized
+# echo "2"$MY_PATH
+common_run() {
+	echo "[RUN] $@"
+	"$@"
+	RES=$?
+	if [ $RES -ne 0 ];
+	then
+		echo "[ERROR] $@ retured $RES"
+		exit 1
+	fi
+}
+# echo "scriptPath1: "$(cd `dirname $0`; pwd)
+# echo "scriptPath2: "$(dirname $(readlink -f $0))
+# echo "scriptPath4: "$(cd "$(dirname "$0")" && pwd)
+# echo "scriptPath5: "$(dirname "$(readlink -f "$0")")
+# echo "scriptPath6: "$(cd "$(dirname "$0")" && pwd -P)
+versionpath=""
+versionpath=$MY_PATH"/active.txt"
+echo $versionpath
+line=""
+version=$(cat $versionpath)
+if [ -z "$version" ]; then
+    exit -1
+fi
+# add library search path
+LIBDIR1=${MY_PATH}"/"${version}"/bin"
+path=$LD_LIBRARY_PATH
+echo $path
+result=$(echo $path | grep "${LIBDIR1}")
+if [ "$result" != "" ]
+#if [ $path =~ $LIBDIR1 ]
+then
+	echo "has execute path alreadly"
+else
+	echo "add path: ${LIBDIR1}"
+	export LD_LIBRARY_PATH=$LIBDIR1:$LD_LIBRARY_PATH
+fi
+
+shell_path=${MY_PATH}"/"${version}"/bin/spshell"
+host_path=${MY_PATH}"/"${version}"/bin/sphost"
+# echo "bin_path: ${bin_path}"
+if [ ! -x "$shell_path" ]; then
+chmod 766 $shell_path
+echo "add run privilege for : ${shell_path}"
+fi
+if [ ! -x "$host_path" ]; then
+chmod 766 $host_path
+echo "add run privilege for : ${host_path}"
+fi
+common_run exec ${shell_path} --test
+exit $?
+
+
+
+

module/CMakeLists.txt

@@ -122,20 +122,21 @@ endif(BUILD_MOUDLE_TEST)
 
 set(MODULE_CONAN_DEP_LIBS)
 
-# add_subdirectory(mod_pinpad)
-# add_subdirectory(mod_cardswiper)
-# add_subdirectory(mod_CenterSetting)
+ add_subdirectory(mod_validityVertifier)
+ add_subdirectory(mod_pinpad)
+ add_subdirectory(mod_cardswiper)
+ add_subdirectory(mod_CenterSetting)
 
 # 遍历实体
- file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
-
- foreach(dir ${all_valid_subdirs})
- 	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
- 		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
- 		message(STATUS "add module ${dir_trimmed}")
- 		add_subdirectory(${dir_trimmed})
- 	endif()
- endforeach(dir)
+# file(GLOB all_valid_subdirs RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/CMakeLists.txt")
+
+# foreach(dir ${all_valid_subdirs})
+# 	if(${dir} MATCHES "^([^/]*)/+CMakeLists.txt")
+# 		string(REGEX REPLACE "^([^/]*)/+CMakeLists.txt" "\\1" dir_trimmed ${dir})
+# 		message(STATUS "add module ${dir_trimmed}")
+# 		add_subdirectory(${dir_trimmed})
+# 	endif()
+# endforeach(dir)
 
 # 汇总要依赖拷贝的第三方库
 set(RVC_CONAN_DEP_LIBS ${RVC_CONAN_DEP_LIBS} ${MODULE_CONAN_DEP_LIBS} PARENT_SCOPE)