无cmd黑框

.gitignore

@@ -256,4 +256,4 @@ settings.json
 include/*
 release/*
 sdk/*
-
+cmake/

CMakeLists.txt

@@ -1,21 +1,18 @@
 project(ECT_TADLAS)
 set (Demo_VERSION_MAJOR 1)
 set (Demo_VERSION_MINOR 0)
-
+add_definitions(-DQT_NO_DEBUG_OUTPUT)
 set( CMAKE_PREFIX_PATH D:/Programs/Qt5.14.0/5.14.0/mingw73_64/lib/cmake )
-# SET( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_LIST_DIR}/release/)
-# SET( LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_LIST_DIR}/release/)
 set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR})
+set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/cbb)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/client)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/server/algorithm)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/server/measuresys)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/server/net)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/server)
 
 # 构建一个 CPack 安装包
-include (InstallRequiredSystemLibraries)
+# include (InstallRequiredSystemLibraries)
 if(WIN32 OR MINGW)
   list(APPEND CPACK_GENERATOR "NSIS")
   set(CPACK_NSIS_PACKAGE_NAME ${PROJECT_NAME})

client/CMakeLists.txt

@@ -1,3 +1,4 @@
+project(ECT_TDLAS_CLIENT)
 set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY")
 cmake_minimum_required( VERSION 3.1 )
 set( CMAKE_CXX_STANDARD 14 )
@@ -18,7 +19,7 @@ include_directories(${Qt5Network_INCLUDE_DIRS})
 
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../)
 
-link_directories(${CMAKE_CURRENT_LIST_DIR}/../cbb/release/lib)
+link_directories(${CMAKE_CURRENT_LIST_DIR}/../release/lib)
 
 
 set ( ETClient_SRCS
@@ -53,8 +54,16 @@ set ( ETClient_MOCS
 	myClientCommand.h
 	)
 QT5_WRAP_CPP(MOCS ${ETClient_MOCS})
+if(WIN32)
+	add_executable ( ETClient WIN32 ${ETClient_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+elseif()
+	add_executable ( ETClient ${ETClient_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+endif(WIN32)
 
-add_executable ( ETClient ${ETClient_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
 target_link_libraries ( ETClient  Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network cbbmodesys )
 # 指定安装路径
-install (TARGETS ETClient DESTINATION bin)
+install (TARGETS ETClient DESTINATION bin)
+# if(WIN32)
+# 	include(DeployQt)
+# 	windeployqt(ETClient)
+# endif(WIN32)

server/CMakeLists.txt

@@ -0,0 +1,4 @@
+project(ECT_TDLAS_SERVER)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/algorithm)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/measuresys)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/net)

server/algorithm/CMakelists.txt

@@ -10,7 +10,7 @@ find_package ( Qt5Core REQUIRED )
 
 include_directories(${Qt5Core_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
-include_directories(${CMAKE_CURRENT_LIST_DIR}/../release/lib/)
+include_directories(${CMAKE_CURRENT_LIST_DIR}/../../release/lib/)
 
 set( SRC
     base_alg.cpp

server/measuresys/CMakelists.txt

@@ -13,7 +13,7 @@ include_directories(${Qt5Core_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
 
-link_directories(${CMAKE_CURRENT_LIST_DIR}/../../cbb/release/lib/)
+link_directories(${CMAKE_CURRENT_LIST_DIR}/../../release/lib/)
 link_directories(${CMAKE_CURRENT_LIST_DIR}/../release/lib/)
 
 set( SRC

server/net/CMakelists.txt

@@ -14,7 +14,7 @@ include_directories(${Qt5Core_INCLUDE_DIRS})
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../)
 include_directories(${CMAKE_CURRENT_LIST_DIR}/../../)
 
-link_directories(${CMAKE_CURRENT_LIST_DIR}/../../cbb/release/lib/)
+link_directories(${CMAKE_CURRENT_LIST_DIR}/../../release/lib/)
 link_directories(${CMAKE_CURRENT_LIST_DIR}/../release/lib/)
 
 set( SRC