Преглед изворни кода

Z991239-890 #comment 注释在Windows下不能编译的实体的CMakeLists,顶层直接编译实体目录,无需再add_directory

gifur пре 5 година
родитељ
комит
37d6ca4bba

+ 9 - 20
Module/CMakeLists.txt

@@ -138,27 +138,16 @@ endif(BUILD_MOUDLE_TEST)
 
 set(MODULE_CONAN_DEP_LIBS)
 
- add_subdirectory(mod_validityVertifier)
- add_subdirectory(mod_pinpad)
- add_subdirectory(mod_cardswiper)
- add_subdirectory(mod_CenterSetting)
- add_subdirectory(mod_BootManager)
- add_subdirectory(mod_upload)
- add_subdirectory(mod_download)
- add_subdirectory(mod_FingerPrint)
- add_subdirectory(mod_evtconverter)
- 
-
 # 遍历实体
-# 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)

+ 0 - 0
Module/mod_Initializer/CMakeLists.txt → Module/mod_Initializer/CMakeLists.txt.useless


+ 0 - 0
Module/mod_accessauth/CMakeLists.txt → Module/mod_accessauth/CMakeLists.txt.useless


+ 0 - 0
Module/mod_evtconverter/CMakeLists.txt → Module/mod_evtconverter/CMakeLists.txt.useless


+ 0 - 0
Module/mod_guiconsole/CMakeLists.txt → Module/mod_guiconsole/CMakeLists.txt.useless


+ 0 - 0
Module/mod_rpc/CMakeLists.txt → Module/mod_rpc/CMakeLists.txt.useless