V0.9.4

1、提交操作

CMakeLists.txt

@@ -194,8 +194,8 @@ file(GLOB GLOBAL_SRC
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/time)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayer)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/xlsx)
-# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
-add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ViewModel)
+add_subdirectory(${CMAKE_SOURCE_DIR}/demo/DesignerPattern)
+# add_subdirectory(${CMAKE_SOURCE_DIR}/demo/ViewModel)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetLibrary)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/VideoPlayerGL)
 # add_subdirectory(${CMAKE_SOURCE_DIR}/demo/OpenGLWidgetTest)

External

@@ -1 +1 @@
-Subproject commit 44b1b143fe3609286dd597d72809be98925aa958
+Subproject commit e2c30fbd4fb5fa893a776e74676d7d38f1b9a685

demo/DesignerPattern/CMakeLists.txt

@@ -5,7 +5,7 @@ set(this_exe DesignerPattern)
 
 #包含源文件
 file(GLOB LOCAL_SRC
-    ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
+    # ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
 
     ${CMAKE_CURRENT_SOURCE_DIR}/*.qrc
     ${CMAKE_CURRENT_SOURCE_DIR}/*.rc
@@ -32,7 +32,7 @@ target_include_directories(${this_exe} PRIVATE
     ${CMAKE_CURRENT_SOURCE_DIR}
     ${CMAKE_SOURCE_DIR}/External/common
     ${CMAKE_SOURCE_DIR}/External/module
-    ${CMAKE_SOURCE_DIR}/External/module/Logs
+    # ${CMAKE_SOURCE_DIR}/External/module/Logs
 
     ${CMAKE_CURRENT_SOURCE_DIR}/AbstractFactory
     ${CMAKE_CURRENT_SOURCE_DIR}/Builder
@@ -51,9 +51,10 @@ target_link_libraries(${this_exe} PRIVATE
 
 target_link_libraries(${this_exe} PRIVATE 
     # ${CURL_LIBRARY}
-    ${spdlog_LIBRARY}
+    # ${spdlog_LIBRARY}
     # ${OpenSSL-1.1.1_LIB_LIBRARY}
     # CURL::libcurl
+    spdlog::spdlog
 )
 
 if(CMAKE_CXX_COMPILER_VERSION LESS 9.0)