【#15】 CMakeList should adapt to linux environment #94

.github/workflows/c-cpp.yml

@@ -33,12 +33,16 @@ jobs:
         sudo apt-get install -y --no-install-recommends \
           qtbase5-dev qtbase5-dev-tools qt5-qmake \
           qttools5-dev qttools5-dev-tools \
-          libqt5svg5-dev
+          libqt5svg5-dev\
+          qtdeclarative5-dev \
+          qtquickcontrols2-5-dev\
+          python3 \
+          uuid-dev
 
 
 
     - name: Configure with CMake (headless)
-      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DSD_BUILD_DESIGNER=OFF -DSD_BUILD_DEMOS=OFF -DQt5_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5
+      run: cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DSD_BUILD_DESIGNER=ON -DSD_BUILD_DEMOS=ON -DQt5_DIR=/usr/lib/x86_64-linux-gnu/cmake/Qt5
 
     - name: Build
       run: cmake --build build --config Release --parallel

Demos/DemoDependencyPlugin/CMakeLists.txt

@@ -5,9 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoDependencyPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-add_definitions(-DSOLID_DESIGNER_UI_HOME)
-add_definitions(-DALICE_DEMO_DEPEND_PLUGIN_HOME)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
@@ -93,6 +90,12 @@ add_library(SolidDemoDependencyPlugin SHARED ${SDP_FILES})
 set_target_properties(SolidDemoDependencyPlugin PROPERTIES FOLDER "Demos")
 #=============================================================================
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDemoDependencyPlugin
+    PRIVATE
+        ALICE_DEMO_DEPEND_PLUGIN_HOME
+)
+
 
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数

Demos/DemoPlugin/CMakeLists.txt

@@ -5,9 +5,6 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDemoPlugin--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-add_definitions(-DSOLID_DESIGNER_UI_HOME)
-add_definitions(-DALICE_DEMO_PLUGIN_HOME)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
@@ -93,6 +90,12 @@ add_library(SolidDemoPlugin SHARED ${SDP_FILES})
 set_target_properties(SolidDemoPlugin PROPERTIES FOLDER "Demos")
 #=============================================================================
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDemoPlugin
+    PRIVATE
+        ALICE_DEMO_PLUGIN_HOME
+)
+
 
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数

Designer/APP/CMakeLists.txt

@@ -9,8 +9,7 @@ message(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>Designer app Directory<<<<<<<<<
 message("CMAKE_SOURCE_DIR == ")
 message("${CMAKE_SOURCE_DIR}")
 message("${CMAKE_CURRENT_SOURCE_DIR}")
-add_definitions(-D_USRDLL)
-add_definitions(-D_CRT_SECURE_NO_WARNINGS)
+
 # 批量添加程序文件，包括源文件 头文件 资源文件等
 # 注意路径是当前目录，不然的话文件无法正确添加到VS中
 FILE(GLOB APP_FILES "${PROJECT_SOURCE_DIR}/Designer/APP/*.cpp" "${PROJECT_SOURCE_DIR}/Designer/APP/*.h")
@@ -51,32 +50,36 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 #============================================================================#
 #  给SolidRender这个工程配置第三方的库
 #============================================================================#
+if(WIN32)
 set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
-find_package(Qt5 COMPONENTS Core Gui Widgets NetWork Quick Qml REQUIRED)
-
 # 设置QT的头文件包含路径
 # 如果找不到环境变量QTDIR的路径，那么自己设置吧; 也可以在GUI交互界面上手动设置
 SET(QTDIR C:/Qt/Qt5.15.14/5.15.14/msvc2019_64)
+endif()
 
-# QT5头文件路径
-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-msvc2012)
+find_package(Qt5 COMPONENTS Core Gui Widgets Network Quick Qml REQUIRED)
 
-#-----------------------------------------------------------------------------
-# 添加需要链接的库文件目录LINK_DIRECTORIES
-# 例如QT库
-#-----------------------------------------------------------------------------
-link_directories(${QTDIR}/lib)
 
+# 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-msvc2012)
+
+    #-----------------------------------------------------------------------------
+    # 添加需要链接的库文件目录LINK_DIRECTORIES
+    # 例如QT库
+    #-----------------------------------------------------------------------------
+    link_directories(${QTDIR}/lib)
+endif()
 
 #-----------------------------------------------------------------------------
 #---------------------------第三方库的头文件和二进制文件----------------------
@@ -138,16 +141,42 @@ add_executable(${PROJECT_NAME}
  ${HEADER_HPP_FILES}
  ${APP_FILES})
 
- # 定义：如何生成 .rcc
+
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(${PROJECT_NAME}
+    PRIVATE
+        _USRDLL
+        _CRT_SECURE_NO_WARNINGS
+)
+
+
+# 定义：如何生成 .rcc
+if(WIN32)
 add_custom_command(OUTPUT "${SD_RCC_FILE}"
   COMMAND ${CMAKE_COMMAND} -E make_directory "${SD_RCC_DIR}"
   COMMAND ${CMAKE_COMMAND} -E echo ">>> GenerateRCC: ${GEN_RCC_BAT} -> ${SD_RCC_FILE}"
-  COMMAND ${CMAKE_COMMAND} -E env "QTDIR_X64=$ENV{QTDIR_X64}" "${GEN_RCC_BAT}" "${SD_RCC_DIR}"
+  COMMAND ${CMAKE_COMMAND} -E env "QTDIR_X64=$ENV{QTDIR_X64}" "${GEN_RCC_BAT}" "${SD_RCC_DIR}" #real execution
 
   WORKING_DIRECTORY "${GEN_RCC_WD}"
   DEPENDS ${SD_QRCS}           # .qrc 变更触发
   VERBATIM
 )
+else()
+ # Linux/macOS：用 Qt 的 rcc 直接生成二进制 rcc
+  find_program(QT_RCC_EXECUTABLE NAMES rcc rcc-qt5)
+  if(NOT QT_RCC_EXECUTABLE)
+    message(FATAL_ERROR "Qt rcc not found. Ensure Qt is installed and rcc is in PATH.")
+  endif()
+
+  add_custom_command(
+  OUTPUT  "${SD_RCC_FILE}"
+  COMMAND ${CMAKE_COMMAND} -E make_directory "${SD_RCC_DIR}"
+  COMMAND "${QT_RCC_EXECUTABLE}" -binary ${SD_QRCS} -o "${SD_RCC_FILE}"
+  WORKING_DIRECTORY "${GEN_RCC_WD}"
+  DEPENDS ${SD_QRCS}
+  VERBATIM
+)
+endif()
 
  # 声明一个“资源生成”目标，并让可执行程序依赖它
 add_custom_target(SolidDesignerRes ALL DEPENDS "${SD_RCC_FILE}")
@@ -205,20 +234,31 @@ install(DIRECTORY "${CMAKE_SOURCE_DIR}/source/resource/Script" DESTINATION "${IN
 # 链接第三方的库
 # @1、链接的动作需要放到add_library之后
 #-----------------------------------------------------------------------------
-message("PROJECT_NAME = ${PROJECT_NAME}")
-target_link_libraries(${PROJECT_NAME}
-    glu32
-    glew32
-    opengl32
-    freeimage
-    log4cplusU
-    AliceCoreApplicationInterface
-    AliceUiFrameWork
-    AliceBasicTool
-    AliceComponentSystem
-    AliceLaunchInterface
-)
 
+find_package(OpenGL REQUIRED)
+message("PROJECT_NAME = ${PROJECT_NAME}")
+if(WIN32)
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        glu32
+        glew32
+        opengl32
+        freeimage
+        log4cplusU
+        AliceCoreApplicationInterface
+        AliceUiFrameWork
+        AliceBasicTool
+        AliceLaunchInterface
+    )
+else()
+    target_link_libraries(${PROJECT_NAME} PRIVATE
+        OpenGL::GL 
+        OpenGL::GLU
+        AliceCoreApplicationInterface
+        AliceUiFrameWork
+        AliceBasicTool
+        AliceLaunchInterface
+    )
+endif()
 
 
 message(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>End Designer APP<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<")

Designer/DB/SolidDesignerModel/CMakeLists.txt

@@ -5,13 +5,7 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDesignerModel--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-add_definitions(-DSOLID_DESIGNER_MODEL_HOME)
-add_definitions(-DALICE_BASIC_SERVICE_HOME)
-
-
 message("${PROJECT_SOURCE_DIR}")
-
-
 FILE(GLOB SOURCE_FILES "${PROJECT_SOURCE_DIR}/Designer/DB/SolidDesignerModel/*.cpp")
 FILE(GLOB HEADER_FILES "${PROJECT_SOURCE_DIR}/Designer/DB/SolidDesignerModel/*.h")
 
@@ -38,6 +32,12 @@ set_target_properties(SolidDesignerModel PROPERTIES FOLDER "Designer/DB")
 #=============================================================================
 
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDesignerModel
+    PRIVATE
+        SOLID_DESIGNER_MODEL_HOME
+)
+
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数
 # 必须放在link之后,否则设置无效
@@ -100,7 +100,6 @@ endif()
 target_link_libraries(SolidDesignerModel PRIVATE
     AliceBasicTool
     AliceFoundation
-	AliceDatabaseInterface
 	AliceModelInterface
 )
 

Designer/Interaction/SolidDesignerInteraction/CMakeLists.txt

@@ -5,12 +5,7 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDesignerInteraction--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-add_definitions(-DSOLID_DESIGNER_INTERACTION_HOME)
-add_definitions(-DALICE_BASIC_SERVICE_HOME)
-
 message("${PROJECT_SOURCE_DIR}")
-
-
 FILE(GLOB SOURCE_FILES "${PROJECT_SOURCE_DIR}/Designer/Interaction/SolidDesignerInteraction/*.cpp")
 FILE(GLOB HEADER_FILES "${PROJECT_SOURCE_DIR}/Designer/Interaction/SolidDesignerInteraction/*.h")
 
@@ -36,6 +31,11 @@ add_library(SolidDesignerInteraction SHARED ${SOURCE_FILES} ${HEADER_FILES})
 set_target_properties(SolidDesignerInteraction PROPERTIES FOLDER "Designer/Interaction")
 #=============================================================================
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDesignerInteraction
+    PRIVATE
+        SOLID_DESIGNER_INTERACTION_HOME
+)
 
 
 #-----------------------------------------------------------------------------

Designer/UI/SolidDesignerCommand/CMakeLists.txt

@@ -4,14 +4,20 @@
 #--Author:  hananiah
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDesignerCommand--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
-
-add_definitions(-DSOLID_DESIGNER_UI_HOME)
-add_definitions(-DSOLID_DESIGNER_COMMAND_HOME)
-
 message("CMAKE_SOURCE_DIR = ${CMAKE_SOURCE_DIR}")
 # 先指定你项目内置的 Python 解释器
-set(_SD_PY_ROOT "${CMAKE_SOURCE_DIR}/ToolChain/Python310")
-set(Python3_EXECUTABLE "${_SD_PY_ROOT}/python.exe" CACHE FILEPATH "SolidDesigner bundled Python" FORCE)
+if(WIN32)
+    # Windows: use repo toolchain python
+    set(_SD_PY_ROOT "${CMAKE_SOURCE_DIR}/ToolChain/Python310")
+    set(Python3_EXECUTABLE "${_SD_PY_ROOT}/python.exe" CACHE FILEPATH "SolidDesigner bundled Python" FORCE)
+else()
+    message("Here is linux python... ...")
+    # Linux/macOS: use system python3
+    find_program(_PY3 NAMES python3 python REQUIRED)
+    set(Python3_EXECUTABLE "${_PY3}" CACHE FILEPATH "Python3 interpreter" FORCE)
+
+endif()
+
 
 # 然后再找 Python3
 find_package(Python3 REQUIRED COMPONENTS Interpreter)
@@ -57,6 +63,12 @@ add_library(SolidDesignerCommand SHARED ${SDC_FILES})
 set_target_properties(SolidDesignerCommand PROPERTIES FOLDER "Designer/UI")
 #=============================================================================
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDesignerCommand
+    PRIVATE
+        SOLID_DESIGNER_COMMAND_HOME
+)
+
 
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数

Designer/UI/SolidDesignerCommand/GeneralCommands/SolidFileOpenCommand.cpp

@@ -1,4 +1,4 @@
-#include "SolidFileOpenCommand.h"
+#include "SolidFileOpenCommand.h"
 
 #include "AliceIMainWindow.h"
 #include "AliceIDocumentManager.h"
@@ -53,7 +53,7 @@ std::unique_ptr<IOperation> SolidFileOpenCommand::Execute(const CommandParameter
 
 	std::wstring filePath = showOpenFileDialog_();
 	if (filePath.empty())
-		return nullptr; // �û�ȡ��
+		return nullptr; // 用户取消
 
 	IDocument* doc = openDocument_(filePath);
 	if (!doc) 
@@ -75,8 +75,8 @@ std::wstring SolidFileOpenCommand::showOpenFileDialog_() const
 {
 	//QWidget* parent = m_mainWindow ? m_mainWindow->AsQMainWindow() : nullptr;
 
-	//// ���˿��Դ� UiApplicationConfig / CommandsConfig �� profile ���ã��˴���һ��
-	//// ��� .alice + ���� CAD ��ʽ��ʾ����
+	//// 过滤可以从 UiApplicationConfig / CommandsConfig 的 profile 中拿，此处给一个
+	//// 针对 .alice + 常规 CAD 格式的示例。
 	//const QString filter =
 	//	QObject::tr("Alice Documents (*.alice);;"
 	//		"STEP Files (*.step *.stp);;"

Designer/UI/SolidDesignerCommand/GeneralCommands/SolidFileSaveCommand.cpp

@@ -94,7 +94,7 @@ IDocument* SolidFileSaveCommand::getActiveDocument_() const
 	//	return nullptr;
 
 	//return m_docManager->GetActiveDocument(); 
-	return false;
+	return nullptr;
 }
 
 bool SolidFileSaveCommand::hasFilePath_(IDocument& doc) const

Designer/UI/SolidDesignerUI/CMakeLists.txt

@@ -5,12 +5,12 @@
 ##########################################################################################################
 message("*--*--*--*--*--*--*--*--*--*--*--*--*--Start SolidDesigner UI--*--*--*--*--*--*--*--*--*--*--**--*--*--*")
 
-add_definitions(-DSOLID_DESIGNER_UI_HOME)
-add_definitions(-DALICE_BASIC_SERVICE_HOME)
-
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
-set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
+if(WIN32)
+  set(CMAKE_PREFIX_PATH "C:/Qt/Qt5.15.14/5.15.14/msvc2019_64")
+endif()
+
 find_package(Qt5Core       5.15 REQUIRED)
 find_package(Qt5Gui        5.15 REQUIRED)
 find_package(Qt5Widgets    5.15 REQUIRED)
@@ -49,6 +49,11 @@ add_library(SolidDesignerUI SHARED ${SOURCE_FILES} ${HEADER_FILES})
 set_target_properties(SolidDesignerUI PROPERTIES FOLDER "Designer/UI")
 #=============================================================================
 
+# 目标级编译宏（代替全局 add_definitions）
+target_compile_definitions(SolidDesignerUI
+    PRIVATE
+        SOLID_DESIGNER_UI_HOME
+)
 
 #-----------------------------------------------------------------------------
 # 根据系统及机器位数设置链接的位数