Forráskód Böngészése

Z991239-968 #comment 恢复其他同事上传的总体改动

gifur 5 éve
szülő
commit
7bd98b24a3
2 módosított fájl, 14 hozzáadás és 13 törlés
  1. 5 0
      CMakeSettings.json
  2. 9 13
      Module/CMakeLists.txt

+ 5 - 0
CMakeSettings.json

@@ -15,6 +15,11 @@
           "name": "BUILD_TESTING",
           "value": "True",
           "type": "BOOL"
+        },
+        {
+          "name": "SIMULATE_ON",
+          "value": "False",
+          "type": "BOOL"
         }
       ]
     },

+ 9 - 13
Module/CMakeLists.txt

@@ -138,20 +138,16 @@ endif(BUILD_MOUDLE_TEST)
 
 set(MODULE_CONAN_DEP_LIBS)
 
-add_subdirectory(mod_validityVertifier)
-add_subdirectory(mod_IDCertificate)
-
-
 # 遍历实体
-# 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)