Merge branch 'master' of https://gitee.com/290198252/proto-debuger

protoDebuger/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
-
+message("CMAKE VERSION " ${VERSION})
-include_directories(third/lua/include)
+include_directories(third/include)
-link_directories(third/lua/lib)
+link_directories(third/lib)
 link_libraries(lua)
 
 project(protoDebuger LANGUAGES CXX)
@@ -17,16 +17,15 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 find_package(Qt5 COMPONENTS Core Quick Widgets REQUIRED)
 
-include(D:\\project\\c++qt\\qsswraper\\CMakeLists.txt)
-
 set(HEADERS       #  待预编译的cpp头文件
-    dialog.h
 )
 
 set(SOURCES       # 待预编译的cpp代码
-    dialog.cpp
     main.cpp
 )
+set(NO_MOC_SOURCES
+
+)
 
 set(RESOURCES
     qml.qrc
@@ -37,23 +36,35 @@ set(QMLS
 )
 
 set (UIS
-    "dialog.ui"
+    ${QsswraperUI}
-    ${QsswraperUI})
+    )
+
+include(D:\\project\\qt\\qsswraper\\CMakeLists.txt)
+include(D:\\project\\qt\\qsswraper\\extserial\\src\\qextserialport.cmake)
 
 QT5_WRAP_CPP(MOC  ${SOURCES} )          # moc预编译代码
 QT5_WRAP_CPP(MOCHEADER  ${HEADERS} )   # moc预编译代码
 QT5_ADD_RESOURCES(RCC ${RESOURCES})     # rcc生成资源cpp
 QT5_WRAP_UI(UIC ${UIS})                # uic生成ui_x.h
 
-message("MOC " ${MOC} ${MOCHEADER})
+FOREACH(list ${SOURCES})
-message("UIC "  ${UIC})
+  message("SOURCES file " ${list})
-message("RCC " ${RCC})
+ENDFOREACH(list)
+
+FOREACH(list ${MOCHEADER})
+  message("MOCHEADER file" ${list})
+ENDFOREACH(list)
+
+FOREACH(list ${NO_MOC_SOURCES})
+  message("NO_MOC_SOURCES file" ${list})
+ENDFOREACH(list)
 
 add_executable(protoDebuger      #最后需要参与链接生成的是
     ${SOURCES}           #1. 原先的cpp代码，
     ${MOC}               #2.  预编译后的cpp
     ${RCC}               #3.  资源cpp代码
     ${UIC}
+    ${NO_MOC_SOURCES}
 )
 
 target_compile_definitions(protoDebuger