Z991239-5361 #comment CMake脚本清理

CMakeLists.txt

@@ -27,6 +27,7 @@ set(CMAKE_CXX_STANDARD 11)
 
 #  Include extend cmake scripts
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/addin/cmake/ )
+set(DEBUGMODE_ON OFF)
 
 include(CheckStructHasMember)
 include(CheckIncludeFiles)
@@ -36,8 +37,14 @@ include(GetGitRevisionDescription)
 include(ComplexLibrary)
 include(TodayTimeStamp)
 include(PrecompiledHeader)
+
 include(WindowsDLLVersion)
+
+# include path enviroment for RVC
 include(BuildMakeSettings)
+include(ModMakeSettings)
+include(ThirdPartySettings)
+
 # Turn on solution folders (2.8.4+) for Visual Studio.
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
@@ -159,14 +166,6 @@ if(DEVOPS_ON)
 		set(BUILD_NUMBER ${RVC_DEV_NUM})
 	endif(DEFINED ENV{ENV_VER_Build})
 
-	if(DEFINED ENV{BUILD_AS_INSTALLER})
-		if($ENV{BUILD_AS_INSTALLER})
-			set(PACK_AS_DEB_PKG ON)
-			set(WITH_ADDITIONAL_RES ON)
-			message(STATUS "built as debian installer $ENV{BUILD_AS_INSTALLER}")
-		endif($ENV{BUILD_AS_INSTALLER})
-	endif(DEFINED ENV{BUILD_AS_INSTALLER})
-
 	if(DEVOPS_ON_CMAKE_PRD)
 		set(RVC_VERSION_SUFFIX "PRD")
 		if(PACK_AS_DEB_PKG)
@@ -254,7 +253,7 @@ if(${CMAKE_GENERATOR} MATCHES "Visual Studio*")
 		set(BUILD_TYPE_NAME "Default")
 	endif()
 	if(NOT CMAKE_GENERATOR_PLATFORM)
-		message(STATUS "set win32 platform default")
+		message(STATUS "set win32 platform default ${CMAKE_SYSTEM_PROCESSOR}")
 		set(CMAKE_GENERATOR_PLATFORM "${CMAKE_SYSTEM_PROCESSOR}")
 	endif()
 
@@ -272,6 +271,7 @@ endif()
 
 set(OLD_CONAN_EXPORTED ${CONAN_EXPORTED})
 
+#Would not happen ever. todo
 if(CONAN_EXPORTED)
 	message(STATUS "Set CONAN_EXPORTED FALSE")
 	set(CONAN_EXPORTED FALSE)
@@ -295,11 +295,6 @@ endif(NOT MSVC)
 
 set(CONAN_EXPORTED ${OLD_CONAN_EXPORTED})
 
-# include path enviroment for RVC
-include(BuildMakeSettings)
-include(ModMakeSettings)
-include(ThirdPartySettings)
-
 message("=-=-=-=-=-=-=-====-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=\n\n")
 message(STATUS "RVC_VERSION=${RVC_VERSION_FULL}, Build time: ${BUILD_YEAR}.${BUILD_MONTH}.${BUILD_DAY}")
 message("\n\n=-=-=-=-=-=-=-====-=-=-=-=-=-=-=--=-=-=-=-=-=-=-=")
@@ -344,18 +339,24 @@ if(DEVOPS_ON_CMAKE_ST)
 	add_compile_definitions(DEVOPS_ON_ST)
 	message(STATUS "add st compile definition")
 	set(COMPILED_ENV_TYPE 2)
+	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
 elseif(DEVOPS_ON_CMAKE_UAT)
 	add_compile_definitions(DEVOPS_ON_UAT)
 	message(STATUS "add uat compile definition")
 	set(COMPILED_ENV_TYPE 3)
+	set(INI_CONTENT "[MicroServiceURL]\nenv=UAT_BIZ")
 elseif(DEVOPS_ON_CMAKE_DEV)
 	add_compile_definitions(DEVOPS_ON_DEV)
 	message(STATUS "add dev compile definition")
+	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
 	set(COMPILED_ENV_TYPE 1)
 elseif(DEVOPS_ON_CMAKE_PRD)
 	add_compile_definitions(DEVOPS_ON_PRD)
 	message(STATUS "add product compile definition")
 	set(COMPILED_ENV_TYPE 4)
+	set(INI_CONTENT "[MicroServiceURL]\nenv=PRD")
+else()
+	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
 endif(DEVOPS_ON_CMAKE_ST)
 
 # Configure MSVC Runtime
@@ -368,14 +369,13 @@ if(MSVC)
 	set(MSVC_DYNAMIC_RUNTIME ${MSVC_RUNTIME})
 	configure_msvc_runtime()
 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
-endif(MSVC)
 
-if(MSVC)
-    add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/source-charset:utf-8>")
+	add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/source-charset:utf-8>")
     add_compile_options("$<$<C_COMPILER_ID:MSVC>:/source-charset:utf-8>")
 
 	add_compile_options("$<$<CXX_COMPILER_ID:MSVC>:/execution-charset:gbk>")
     add_compile_options("$<$<C_COMPILER_ID:MSVC>:/execution-charset:gbk>")
+
 endif(MSVC)
 
 # Enable 64bit file support on linux and FreeBSD.
@@ -402,7 +402,14 @@ if(CMAKE_COMPILER_IS_GNUCC)
 		endif()
 	endif()
 	# active warning or gun c compiler would not burn warning if not necessary.
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
+	if(DEBUGMODE_ON)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g3 -rdynamic")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3 -rdynamic")
+	else()
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g -rdynamic")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -rdynamic")
+	endif()
+	message(STATUS "add definition: ${CMAKE_C_FLAGS} || ${CMAKE_CXX_FLAGS}")
 endif()
 
 if(MSVC)
@@ -552,17 +559,6 @@ endif(UNIX)
 # Include directories
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
-if(DEVOPS_ON_CMAKE_ST)
-	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
-elseif(DEVOPS_ON_CMAKE_UAT)
-	set(INI_CONTENT "[MicroServiceURL]\nenv=UAT_BIZ")
-elseif(DEVOPS_ON_CMAKE_DEV)
-	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
-elseif(DEVOPS_ON_CMAKE_PRD)
-	set(INI_CONTENT "[MicroServiceURL]\nenv=PRD")
-else()
-	set(INI_CONTENT "[MicroServiceURL]\nenv=ST_BIZ")
-endif(DEVOPS_ON_CMAKE_ST)
 # 生成env.ini文件
 file(WRITE ${CMAKE_BINARY_DIR}/env.ini "${INI_CONTENT}")
 message("Generated env.ini file in ${CMAKE_BINARY_DIR}")
@@ -570,32 +566,16 @@ message("Generated env.ini file in ${CMAKE_BINARY_DIR}")
 # Configure files
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/ChangeLog.in" ${CMAKE_BINARY_DIR}/ChangeLog @ONLY)
 
-if(SIMULATE_ON)
-	if(EXISTS "${RVC_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR}" AND IS_DIRECTORY "${RVC_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR}")
-		message(STATUS "install directory existed.")
-		set(RVC_RUNTIME_OUTPUT_DIRECTORY "${RVC_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR}")
-	else()
-		message(STATUS "install directory \"${RVC_INSTALL_PREFIX}${CMAKE_INSTALL_BINDIR}\" is not existed!")
-		set(SIMULATE_ON OFF)
-	endif()
-endif(SIMULATE_ON)
-
-if(SIMULATE_ON)
-	message(STATUS "simulate the real executive path environment, for debug easily")
-	rvc_set_library_output_dir(${RVC_RUNTIME_OUTPUT_DIRECTORY})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+if(WIN32)
+	set(RVC_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_CONFIGURATION_TYPES}")
 else()
-	set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-	set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
-	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-	set(CMAKE_PDB_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-	if(WIN32)
-		set(RVC_PDB_BINARY_DIR "${CMAKE_BINARY_DIR}/bin/${CMAKE_CONFIGURATION_TYPES}")
-	else()
-		set(RVC_PDB_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
-	endif(WIN32)
-	message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
-
-endif(SIMULATE_ON)#end simulate
+	set(RVC_PDB_BINARY_DIR ${CMAKE_BINARY_DIR}/bin)
+endif(WIN32)
+message(STATUS "RVC_PDB_BINARY_DIR: ${RVC_PDB_BINARY_DIR}")
 
 add_subdirectory(Framework)
 if(BUILD_MODULE)
@@ -729,14 +709,13 @@ else(MSVC)
 	file(GLOB VENDOR_ROOT_CONFIG_FILES "${CMAKE_SOURCE_DIR}/addin/hardwarecfg/root-*.ini")
 	install(FILES ${VENDOR_ROOT_CONFIG_FILES} DESTINATION "${PACK_INSTALL_RUN_DIR}/hardwarecfg" COMPONENT scripts)
 	install(PROGRAMS ${BAT_SCRIPTS} DESTINATION "${RVC_BASE_PATH}" COMPONENT scripts)
+	# TODO: rewrite install.sh to match update pacakge.
+	if(NOT PACK_AS_DEB_PKG)
+		install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+		install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
+	endif(NOT PACK_AS_DEB_PKG)
 endif(MSVC)
 
-# TODO: rewrite install.sh to match update pacakge.
-if(NOT MSVC AND NOT PACK_AS_DEB_PKG)
-	install(PROGRAMS "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/install.sh" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-	install(FILES "${CMAKE_SOURCE_DIR}/addin/packaging/UOS/Readme.txt" DESTINATION "${PACK_INSTALL_RUN_DIR}/./.." COMPONENT scripts)
-endif(NOT MSVC AND NOT PACK_AS_DEB_PKG)
-
 list(REMOVE_DUPLICATES RVC_CONAN_DEP_LIBS)
 if(CONAN_LIB_DIRS_QT)
 	message(STATUS "remote qt dir:${CONAN_LIB_DIRS_QT}")
@@ -811,7 +790,6 @@ file(GLOB RVC_RESOURCE_FILES LIST_DIRECTORIES FALSE "${CMAKE_SOURCE_DIR}/addin/a
 install(FILES ${RVC_RESOURCE_FILES} DESTINATION ${RVC_RUNTIME_PATH} COMPONENT resources)
 
 install(DIRECTORY "${CONAN_RES_DIRS_AUDIO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
-#install(DIRECTORY "${CONAN_RES_DIRS_VIDEO}" DESTINATION "${PACK_INSTALL_DATA_DIR}" COMPONENT resources)
 
 if(CONAN_RES_DIRS_SOGOUIME)
 	message(STATUS "include sogou input installation.")
@@ -833,90 +811,6 @@ if(CONAN_RES_DIRS_VENDORFILE)
 	install(DIRECTORY "${CONAN_RES_DIRS_VENDORFILE}" DESTINATION "${PACK_INSTALL_MISCS_DIR}" COMPONENT resources)
 endif(CONAN_RES_DIRS_VENDORFILE)
 
-if(NOT MSVC)
-	if(DEVOPS_ON)
-		set(CHANGELOG_HTML_PATH ${CMAKE_CURRENT_BINARY_DIR}/ChangeLog.html)
-		execute_process(COMMAND python3 --version
-				RESULT_VARIABLE return_code
-				OUTPUT_VARIABLE PYTHON_VERSION_OUTPUT
-				ERROR_VARIABLE PYTHON_VERSION_OUTPUT)
-		if("${return_code}" STREQUAL "0")
-			message("python3 version: ${return_code} =~= ${PYTHON_VERSION_OUTPUT}")
-			# execute_process(COMMAND "which pip" COMMAND "pip" COMMAND "type pip" COMMAND "hash -r")
-			execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py 
-				${CMAKE_BINARY_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
-				RESULT_VARIABLE return_code
-				OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-				ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-			message(WARN "exec: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-			string(FIND "${PYTHON_MARKDOWN_ERROR}" "No module named 'markdown'" CheckPos)
-			if("${return_code}" STREQUAL "1" AND NOT ("${CheckPos}" STREQUAL "-1"))
-				message(WARN "install markdown by pip...")
-				execute_process(COMMAND "pip3 install markdown"
-					RESULT_VARIABLE return_code
-					OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-					ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-				message(WARN "install markdown: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-				if("${return_code}" STREQUAL "0")
-					execute_process(COMMAND python3 ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py 
-						${CMAKE_BINARY_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
-						RESULT_VARIABLE return_code
-						OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-						ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-					message(WARN "exec again: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-				endif()
-			endif()
-		else()
-			message(WARN "py version failed: ${return_code} =~= ${PYTHON_VERSION_OUTPUT} == ${PYTHON_VERSION_OUTPUT}")
-		endif()
-	elseif(WITH_UPDATE_CHANGELOG)
-		set(LOCAL_WWW_PATH "/var/www/html")
-		if(EXISTS ${LOCAL_WWW_PATH} AND IS_DIRECTORY ${LOCAL_WWW_PATH})
-			set(CHANGELOG_HTML_PATH ${LOCAL_WWW_PATH}/index.html)
-			execute_process(COMMAND python --version
-				RESULT_VARIABLE return_code
-				OUTPUT_VARIABLE PYTHON_VERSION_OUTPUT
-				ERROR_VARIABLE PYTHON_VERSION_OUTPUT)
-			if("${return_code}" STREQUAL "0")
-				message("python version: ${return_code} =~= ${PYTHON_VERSION_OUTPUT}")
-				execute_process(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py 
-					${CMAKE_BINARY_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
-					RESULT_VARIABLE return_code
-					OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-					ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-				message(WARN "exec: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-				string(FIND "${PYTHON_MARKDOWN_ERROR}" "No module named markdown" CheckPos)
-				if("${return_code}" STREQUAL "1" AND NOT ("${CheckPos}" STREQUAL "-1"))
-					message(WARN "install markdown by pip...")
-					execute_process(COMMAND "pip install markdown"
-						RESULT_VARIABLE return_code
-						OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-						ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-					message(WARN "install markdown: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-					if("${return_code}" STREQUAL "0")
-						execute_process(COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/md2html.py 
-							${CMAKE_BINARY_DIR}/ChangeLog ${CHANGELOG_HTML_PATH}
-							RESULT_VARIABLE return_code
-							OUTPUT_VARIABLE PYTHON_MARKDOWN_OUTPUT
-							ERROR_VARIABLE PYTHON_MARKDOWN_ERROR)
-						message(WARN "exec again: ${return_code} =$= ${PYTHON_MARKDOWN_OUTPUT} == ${PYTHON_MARKDOWN_ERROR}")
-					endif()
-				endif()
-			else()
-				message(WARN "py version failed: ${return_code} =~= ${PYTHON_VERSION_OUTPUT} == ${PYTHON_VERSION_OUTPUT}")
-			endif()
-		else()
-		endif(EXISTS ${LOCAL_WWW_PATH} AND IS_DIRECTORY ${LOCAL_WWW_PATH})
-	endif(DEVOPS_ON)
-
-endif(NOT MSVC)
-
-if(EXISTS ${CHANGELOG_HTML_PATH})
-	install(FILES ${CHANGELOG_HTML_PATH} DESTINATION ${RVC_RESOURCE_PATH} COMPONENT scripts)
-else()
-	message(WARN "no any changelog file.")
-endif()
-
 #appoint the component to install , except header file here.
  #set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE TRUE)

DevAdapter/CMakeLists.txt

@@ -97,9 +97,6 @@ message(STATUS "lib rely on directory: ${DIFF_PLATFORM_SUB_DIR}")
 if(RVC_INTEGRATE_BUILD)
     #include ErrorCode.h
     include_directories(${RVC_COMMON_INCLUDE_DIR})
-    if(SIMULATE_ON)
-        rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_VENDOR_PATH}")
-    endif(SIMULATE_ON)
 endif(RVC_INTEGRATE_BUILD)
 
 macro(rvc_traverse_sub_cmake_dirs)
@@ -184,13 +181,6 @@ macro(rvc_dev_config_library _module_name _module_prefix)
     target_include_directories(${MODULE_FULL_NAME} PRIVATE ${DEVADAPTER_CURRENT_INCLUDES_DIR} ${VENDOR_CURRENT_INCLUDE_DIR})
     target_link_directories(${MODULE_FULL_NAME} PRIVATE ${DEVADAPTER_CURRENT_LIB_DIR} ${VENDOR_CURRENT_LIB_DIR})  
 
-    if(SIMULATE_ON)
-        set_target_properties(${MODULE_FULL_NAME} PROPERTIES 
-            LIBRARY_OUTPUT_DIRECTORY_DEBUG "${RVC_INSTALL_PREFIX}${RVC_VENDOR_PATH}"
-            LIBRARY_OUTPUT_DIRECTORY_RELEASE "${RVC_INSTALL_PREFIX}${RVC_VENDOR_PATH}"
-        )
-    endif(SIMULATE_ON)
-
     if(MSVC)
         set_property(TARGET ${MODULE_FULL_NAME} PROPERTY FOLDER "devadapter/${CURRENT_VENDOR}/")
     endif(MSVC)

Module/CMakeLists.txt

@@ -23,10 +23,6 @@ if(BUILD_TESTING)
     set(BUILD_MOUDLE_TEST ON)
 endif(BUILD_TESTING)
 
-if(SIMULATE_ON)
-    rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
-endif(SIMULATE_ON)
-
 macro(add_module_libraries _module_prefix _module_name _module_version)
     
     string(STRIP ${_module_version} RAW_VERSION_STRING)
@@ -69,13 +65,6 @@ macro(add_module_libraries _module_prefix _module_name _module_version)
     endif(BUILD_MOUDLE_TEST)
 
     add_library(${_module_name} SHARED ${${_module_prefix}_SRCS} ${${_module_name}_TEST_SRCS})
-    if(SIMULATE_ON)
-        set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_PATH "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
-        set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
-        set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
-        set_target_properties( ${_module_name} PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE "${RVC_INSTALL_PREFIX}${RVC_MODULE_PATH}")
-        # etc for the other available configuration types (MinSizeRel, RelWithDebInfo)
-    endif()
 
     target_compile_definitions(${_module_name} PUBLIC "${_module_prefix}_EXPORTS")
     target_include_directories(${_module_name} PRIVATE 

Other/CMakeLists.txt

@@ -1,7 +1,3 @@
-if(SIMULATE_ON)
-	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
-endif(SIMULATE_ON)
-
 add_subdirectory(libpublicFun)
 add_subdirectory(acmstrdec)
 add_subdirectory(acmstrenc)

Other/unix/CMakeLists.txt

@@ -1,7 +1,3 @@
-if(SIMULATE_ON)
-	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
-endif(SIMULATE_ON)
-
 add_subdirectory(libbizchan)
 
 add_subdirectory(libsharememory)

Other/win/CMakeLists.txt

@@ -1,7 +1,3 @@
-if(SIMULATE_ON)
-	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
-endif(SIMULATE_ON)
-
 add_subdirectory(libvideohorflip)
 
 add_subdirectory(libsharememory)

Plugins/CMakeLists.txt

@@ -1,7 +1,3 @@
-if(SIMULATE_ON)
-	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
-endif(SIMULATE_ON)
-
 set(PLUGINS_CONAN_DEP_LIBS)
 set(PLUGINS_COMM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include)
 

Tool/CMakeLists.txt

@@ -1,7 +1,3 @@
-if(SIMULATE_ON)
-	rvc_set_library_output_dir("${RVC_INSTALL_PREFIX}${RVC_RUNTIME_PATH}")
-endif(SIMULATE_ON)
-
 #local target
 set(RVCCOMM_LIB RVCComm)
 set(SPBASE_LIB spbase)

addin/cmake/ConfigOptions.cmake

@@ -29,8 +29,6 @@ option(WITH_DEBUG_SYMBOLS "Pack debug symbols to installer" OFF)
 
 option(WITH_THIRD_PARTY "Build third-party components" ON)
 
-option(SIMULATE_ON "/run/version/1.2.3.4/" OFF)
-
 option(BUILD_MODULE "whether build entity module or not" ON)
 
 option(BUILD_TOOLS "whether build tools or not" ON)
@@ -52,8 +50,6 @@ option(WITH_ADDITIONAL_RES "download other resource file or for skipping big fil
 # depreate now 20230420@Gifur
 option(WITH_UPDATE_FORMAT "build the artifictory as update pacakge format" OFF)
 
-option(WITH_UPDATE_CHANGELOG "scheduling producting changelog html format result" OFF)
-
 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)

addin/cmake/DependencyConanFiles.cmake

@@ -15,6 +15,7 @@ set(CONAN_ALLPLATFORM_LIB_NAMES
 	libtiff/4.0.9@LR04.02_ThirdParty/testing
 	#include/test
 	Catch/2.13.0@LR04.02_ThirdParty/stable
+	#gtest/1.8.1@LR04.02_ThirdParty/stable
 	#mod_CustMngrAuth mod_uplog, mod_accessauth
 	#skip it, replaced it with RVCFramework ones
 	#jsoncpp/1.9.0@LR04.02_ThirdParty/stable # !!!!support build missing!!!!