【AL-75】fix the problems of workbench initialization and implement rib…

CMakeLists.txt

@@ -1,7 +1,7 @@
 ##########################################################################################################
 #--Date:    2021.03.10
 #--Project: SolidRender
-#--Author:  hubery.x.hsu
+#--Author:  hananiah
 #--Note:位于SolidRender顶级目录下面
 #--2021.10.03: 增加INSTALL项目，实现工程的自动安装功能
 #              今日对工程的生成目录做重大调整，以后禁止VS工程的路径与源码同目录
@@ -158,24 +158,6 @@ endif()
 # set(CMAKE_AUTORCC ON)
 # set(CMAKE_AUTOUIC ON)
 
-# 解决无法跳转到头文件的问题
-set(QTDIR_X64 $ENV{QTDIR})
-set(QTDIR_X64_include $ENV{QTDIR}/include)
-set(QTDIR_X64_include_ActiveQt $ENV{QTDIR}/include/ActiveQt)
-set(QTDIR_X64_include_QtCore $ENV{QTDIR}/include/QtCore)
-set(QTDIR_X64_include_QtNetwork $ENV{QTDIR}/include/QtNetwork)
-set(QTDIR_X64_include_QtWidgets $ENV{QTDIR}/include/QtWidgets)
-set(QTDIR_X64_include_QtWebEngineWidgets $ENV{QTDIR}/include/QtWebEngineWidgets)
-set(QTDIR_X64_include_QtGui $ENV{QTDIR}/include/QtGui)
-set(QTDIR_X64_include_QtXml $ENV{QTDIR}/include/QtXml)
-set(QTDIR_X64_include_QtScript $ENV{QTDIR}/include/QtScript)
-set(QTDIR_X64_QtScriptTools $ENV{QTDIR}/include/QtScriptTools)
-set(QTDIR_X64_include_QtScriptTools $ENV{QTDIR}/include/QtScriptTools)
-set(QTDIR_X64_include_QtWidgets_5_15_14_QtWidgets $ENV{QTDIR}/include/QtWidgets/5.15.14/QtWidgets)
-set(QTDIR_X64_include_QtCore_5_15_14_QtCore ${QTDIR}/include/QtCore/5.15.14/QtCore)
-set(QTDIR_X64_include_QtConcurrent $ENV{QTDIR}/include/QtConcurrent)
-set(QTDIR_X64_mkspecs_win32_msvc ${QTDIR}/mkspecs/win32-msvc)
-set(QTDIR_X64_lib $ENV{QTDIR}/lib)
 
 #----------------------------------------------------------------------------
 # 开启项目分组

Demos/DemoDependencyPlugin/CMakeLists.txt

@@ -5,13 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoDependencyPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-find_package(Qt5Core       5.15 REQUIRED)
-find_package(Qt5Gui        5.15 REQUIRED)
-find_package(Qt5Widgets    5.15 REQUIRED)
-
 
 message("${PROJECT_SOURCE_DIR}")
 

Demos/DemoPlugin/CMakeLists.txt

@@ -5,14 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-find_package(Qt5Core       5.15 REQUIRED)
-find_package(Qt5Gui        5.15 REQUIRED)
-find_package(Qt5Widgets    5.15 REQUIRED)
-
-
 message("${PROJECT_SOURCE_DIR}")
 
 set(SDP "${PROJECT_SOURCE_DIR}/Demos/DemoPlugin")

Designer/APP/CMakeLists.txt

@@ -50,30 +50,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #============================================================================#
 #  给SolidRender这个工程配置第三方的库
 #============================================================================#
-if(WIN32)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-# 设置QT的头文件包含路径
-# 如果找不到环境变量QTDIR的路径，那么自己设置吧; 也可以在GUI交互界面上手动设置
-SET(QTDIR C:/Qt/Qt5.15.14/5.15.14/msvc2019_64)
-endif()
-
 find_package(Qt5 COMPONENTS Core Gui Widgets Network Quick Qml REQUIRED)
 
 
-# QT5头文件路径
 if(WIN32)
-    message("----------------qt5 files include directory--------------------")
-    include_directories(${QTDIR}/include)
-    include_directories(${QTDIR}/include/QtWidgets)
-    include_directories(${QTDIR}/include/QtCore)
-    include_directories(${QTDIR}/include/QtGui)
-    include_directories(${QTDIR}/include/QtOpenGL)
-    include_directories(${QTDIR}/include/QtMultimedia)
-    include_directories(${QTDIR}/include/QtQuick)
-    include_directories(${QTDIR}/include/QtQml)
-    include_directories(${QTDIR}/include/QtNetwork)
-    include_directories(${QTDIR}/mkspecs/win32-msvc)
-
     #-----------------------------------------------------------------------------
     # 添加需要链接的库文件目录LINK_DIRECTORIES
     # 例如QT库
@@ -183,10 +163,20 @@ add_custom_target(SolidDesignerRes ALL DEPENDS "${SD_RCC_FILE}")
 add_dependencies(${PROJECT_NAME} SolidDesignerRes)
 
 # 无论什么生成器，把 .rcc 复制到运行目录（等价于通用版 “Pre-Build”）
-add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+#add_custom_command(TARGET ${PROJECT_NAME} PRE_BUILD
+#  COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources"
+#  COMMAND ${CMAKE_COMMAND} -E copy_if_different
+#          "${SD_RCC_FILE}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
+#  VERBATIM
+#)
+
+# 生成后的部署（拷贝）——跟随 SolidDesignerRes，而不是跟随 exe
+add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
   COMMAND ${CMAKE_COMMAND} -E make_directory "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources"
+  COMMAND ${CMAKE_COMMAND} -E echo ">>> Deploy RCC: ${SD_RCC_FILE} -> $<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
   COMMAND ${CMAKE_COMMAND} -E copy_if_different
-          "${SD_RCC_FILE}" "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
+          "${SD_RCC_FILE}"
+          "$<TARGET_FILE_DIR:${PROJECT_NAME}>/resources/SolidDesignerRes.rcc"
   VERBATIM
 )