T20L8071 #comment 修复了cmake脚本的bug，准备动代码

CMakeLists.txt

@@ -35,6 +35,9 @@ option(INSTALL_INCLUDE_FILES "Enable installation of include header file or thir
 # 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/addin/cmake/ )
 
+# Turn on solution folders (2.8.4+)
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 set(BUILD_NUMBER 0)
 if ($ENV{BUILD_NUMBER})
 	set(BUILD_NUMBER $ENV{BUILD_NUMBER})
@@ -70,7 +73,6 @@ message("RVC_VERSION=${RVC_VERSION_FULL}")
 configure_file("${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_BINARY_DIR}/version.h")
 include_directories(${PROJECT_BINARY_DIR})
 
-# ���������ļ��Ĵ��·��
 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)
@@ -105,10 +107,6 @@ if(MSVC)
 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
 endif(MSVC)
 
-
-# Turn on solution folders (2.8.4+)
-set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
 # Window occurs '/' error
 STRING(REGEX REPLACE "^([A-Z]*.)([/\\].*)" "\\1" CURRENT_DISK "${CMAKE_CURRENT_SOURCE_DIR}")
 # message(STATUS "current disk: ${CURRENT_DISK}")
@@ -116,12 +114,10 @@ set(OUTPUT_CUR_DISK_PATH "${CURRENT_DISK}\\")
 set(OUTPUT_VERSION_DIR_PATH "${OUTPUT_CUR_DISK_PATH}run\\version")
 set(OUTPUT_CUR_VERSION_PATH "${OUTPUT_VERSION_DIR_PATH}\\${RVC_VERSION}")
 
-
 set(PACK_INSTALL_PREFIX_ORIGIN "run")
 set(PACK_INSTALL_PREFIX_VERSION "${PACK_INSTALL_PREFIX_ORIGIN}/version")
 set(PACK_INSTALL_PREFIX_CUR_VER "run/version/${RVC_VERSION}")
 
-
 set(RVC_INCLUDE_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/include")
 set(RVC_LIBRARY_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/lib")
 set(RVC_RUNTIME_PATH "${PACK_INSTALL_PREFIX_CUR_VER}/bin")
@@ -184,10 +180,12 @@ if(BUILD_SHARED_LIBS)
 	message(STATUS "build shared libs")
 endif(BUILD_SHARED_LIBS)
 
+find_package(Threads REQUIRED)
+
 include_directories(Common)
 add_subdirectory(third_party)
 add_subdirectory(libtoolkit)
-add_subdirectory(RvcComm)
+add_subdirectory(RVCComm)
 add_subdirectory(spbase)
 add_subdirectory(spshell)
 add_subdirectory(sphost)
@@ -255,7 +253,7 @@ endif()
 
 file(GLOB BIN_FILES "${CMAKE_SOURCE_DIR}/addin/din/*")
 install(FILES ${BIN_FILES} DESTINATION "${RVC_RUNTIME_PATH}" COMPONENT libraries)
-#install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/din" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT libraries)
+#install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/bin" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT libraries)
 install(DIRECTORY "${CMAKE_SOURCE_DIR}/addin/cfg" DESTINATION "${PACK_INSTALL_PREFIX_CUR_VER}" COMPONENT configs FILES_MATCHING PATTERN "*.ini")
 configure_file("${CMAKE_CURRENT_SOURCE_DIR}/addin/cfg/shell.ini.in" ${CMAKE_BINARY_DIR}/shell.ini @ONLY)
 install(FILES ${CMAKE_BINARY_DIR}/shell.ini DESTINATION ${RVC_CONFIG_PATH})

CMakeSettings.json

@@ -20,9 +20,30 @@
       "installRoot": "${projectDir}\\out\\install\\${name}",
       "cmakeCommandArgs": "",
       "buildCommandArgs": "",
-      "ctestCommandArgs": "",
+      "ctestCommandArgs": "-C Debug",
       "inheritEnvironments": [ "msvc_x86" ],
       "variables": []
+    },
+    {
+      "name": "Linux-Debug",
+      "generator": "Unix Makefiles",
+      "configurationType": "Debug",
+      "cmakeExecutable": "/usr/bin/cmake",
+      "remoteCopySourcesExclusionList": [ ".vs", ".git", "out" ],
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "linux_x64" ],
+      "remoteMachineName": "928485471;99.12.200.186 (username=gifur, port=22, authentication=Password)",
+      "remoteCMakeListsRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/src",
+      "remoteBuildRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/build/${name}",
+      "remoteInstallRoot": "$HOME/.vs/${projectDirName}/${workspaceHash}/out/install/${name}",
+      "remoteCopySources": true,
+      "rsyncCommandArgs": "-t --delete --delete-excluded --exclude \"/build\" --exclude \"/out\" --exclude-from=.gitignore",
+      "remoteCopyBuildOutput": false,
+      "remoteCopySourcesMethod": "rsync",
+      "addressSanitizerRuntimeFlags": "detect_leaks=0",
+      "variables": []
     }
   ]
 }

RVCComm/CMakeLists.txt

@@ -1,4 +1,3 @@
-#project(RvcCommon)
 set(MODULE_NAME "RVCComm")
 set(MODULE_PREFIX "RVCCOMM")
 
@@ -23,16 +22,14 @@ SET(${MODULE_PREFIX}_SRCS
 	XZip.h)
 
 if (WIN32)
-  set (RC_VERSION_MAJOR ${RVC_VERSION_MAJOR})
-  set (RC_VERSION_MINOR ${RVC_VERSION_MINOR})
-  set (RC_VERSION_BUILD ${RVC_VERSION_REVISION})
-
-  configure_file(
-    ${CMAKE_SOURCE_DIR}/Version.rc.in
-    ${CMAKE_CURRENT_BINARY_DIR}/version.rc
-    @ONLY)
-
-  set ( ${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
+	  set (RC_VERSION_MAJOR ${RVC_VERSION_MAJOR})
+	  set (RC_VERSION_MINOR ${RVC_VERSION_MINOR})
+	  set (RC_VERSION_BUILD ${RVC_VERSION_REVISION})
+	  configure_file(
+		${CMAKE_SOURCE_DIR}/Version.rc.in
+		${CMAKE_CURRENT_BINARY_DIR}/version.rc
+		@ONLY)
+	  set ( ${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/version.rc)
 endif()
 
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})

sphost/CMakeLists.txt

@@ -5,7 +5,7 @@ set(MODULE_PREFIX "SPHOST")
 set(${MODULE_PREFIX}_SRCS
 	modManage.cpp
 	sphost.c
-	spHostLog.cpp
+	SpHostLog.cpp
 	sphostMonitor.cpp
 )
 

third_party/scew/expat-2.1.0/CMakeLists.txt

@@ -88,7 +88,7 @@ if(BUILD_tools AND NOT WINCE)
 
     add_executable(xmlwf ${xmlwf_SRCS})
     target_link_libraries(xmlwf expat)
-    install(TARGETS xmlwf DESTINATION {CMAKE_INSTALL_BINDIR})
+    install(TARGETS xmlwf DESTINATION ${CMAKE_INSTALL_BINDIR})
     install(FILES doc/xmlwf.1 DESTINATION share/man/man1)
 endif(BUILD_tools AND NOT WINCE)