v1.1.1.2:optimize cmake scripts for linux

coder4869 · coder4869 · commit bf45248c55a7 · 2025-04-06T20:17:22.000+08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+## [2025.04.06] - v1.1.1.2
+### [Optimize] cmake scripts for linux
 
 ## [2025.04.05] - v1.1.1.1
 ### [Optimize] windows package section and doc
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
@@ -23,7 +23,7 @@ message("CMAKE_TOOLCHAIN_ROOT = ${CMAKE_TOOLCHAIN_ROOT} ")
 message("include(${CMAKE_TOOLCHAIN_ROOT}/cmake-core/global.cmake) ")
 
 
-project(${PROJECT_NAME} VERSION 1.1.1.1)
+project(${PROJECT_NAME} VERSION 1.1.1.2)
 # set(CMAKE_DEBUG_POSTFIX d)
 set(LIB_TYPE SHARED) # SHARED STATIC
 # set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
diff --git a/app/doc/build.md b/app/doc/build.md
@@ -30,7 +30,7 @@
     * build osx lib: `sh $HOME/Desktop/DevAssistant/app/run_unix.sh build`
 - 2-Linux:
     * Setup-env: 
-        * Ubuntu/Debian: `bash /opt/shared_dir/DevAssistant/tools/env-apt.sh`
+        * Ubuntu/OpenKylin2.0: `bash /opt/shared_dir/DevAssistant/tools/env-apt.sh`
     * Run way1:
         * `sed -i 's/\r//' /opt/shared_dir/DevAssistant/app/run_unix.sh && bash /opt/shared_dir/DevAssistant/app/run_unix.sh`
     * Run way2:
@@ -65,7 +65,7 @@
     * `sh $HOME/Desktop/DevAssistant/app/run_android.sh`
 - 2-Linux:
     * Setup-env:
-        * Ubuntu/Debian: `bash /opt/shared_dir/DevAssistant/tools/env-apt.sh`
+        * Ubuntu/OpenKylin2.0: `bash /opt/shared_dir/DevAssistant/tools/env-apt.sh`
     * Run way1:
         * `sed -i 's/\r//' /opt/shared_dir/DevAssistant/app/run_android.sh && bash /opt/shared_dir/DevAssistant/app/run_android.sh`
     * Run way2:
diff --git a/app/pkg-win-nsis.bat b/app/pkg-win-nsis.bat
@@ -21,7 +21,7 @@ start /wait %QT_HOME%\bin\windeployqt.exe -qmldir %QT_HOME%/qml %BIN_DIR%\%PROJ_
 
 call %SCRIPT_DIR%\vs-env.bat
 
-set VERSION="1.1.1.1"
+set VERSION="1.1.1.2"
 echo packaging %VERSION% for "x64"
 makensis /INPUTCHARSET UTF8 /DPRODUCT_NAME=%PROJ_NAME% /DPRODUCT_VERSION=%VERSION% /DOS_ARCH="x64" %SCRIPT_DIR%/pkg-win-nsis.nsi
 echo packaging %VERSION% for "x86"
diff --git a/app/run_unix.sh b/app/run_unix.sh
@@ -46,7 +46,7 @@ else # Linux
     if [[ `uname` == "Linux" ]]; then
         if [[ -f "/etc/redhat-release" ]]; then # Redhat / CentOS
             LINUX_OS="CentOS"
-        elif [[ -f "/etc/lsb-release" ]]; then # Ubuntu / Debian
+        elif [[ -f "/etc/lsb-release" ]]; then # Ubuntu / OpenKylin2.0
             LINUX_OS="Ubuntu"
         fi
     fi
diff --git a/app/scripts/cmake/cmake-qt/qt_libs.cmake b/app/scripts/cmake/cmake-qt/qt_libs.cmake
@@ -85,7 +85,7 @@ if(WITH_QT)
         # CentOS
         SET(QT_INC_HOME /usr/include/qt5)       
         SET(QT_LIB_HOME /usr/lib64)   
-        # Ubuntu
+        # Ubuntu / OpenKylin2.0
         if("${LINUX_OS}" STREQUAL "Ubuntu")
             SET(QT_INC_HOME /usr/include/x86_64-linux-gnu/qt5)       
             SET(QT_LIB_HOME /usr/lib/x86_64-linux-gnu)   
diff --git a/app/src/qtmodules/QtHelp/QDAHelpDialog.cpp b/app/src/qtmodules/QtHelp/QDAHelpDialog.cpp
@@ -30,9 +30,9 @@ void QDAHelpDialog::OnHelpShow()
 void QDAHelpDialog::OnShowVersion()
 {
     std::string version = u8R"(
-版本号(Version) : v1.1.1.1
+版本号(Version) : v1.1.1.2
    
-日期(Date) : 2025/03/27
+日期(Date) : 2025/04/06
     )";
     QMessageBox::information(NULL, QStringLiteral("Version"), QString::fromStdString(version));
 }
diff --git a/plugins/project/project/build/run_unix.sh b/plugins/project/project/build/run_unix.sh
@@ -46,7 +46,7 @@ else # Linux
     if [[ `uname` == "Linux" ]]; then
         if [[ -f "/etc/redhat-release" ]]; then # Redhat / CentOS
             LINUX_OS="CentOS"
-        elif [[ -f "/etc/lsb-release" ]]; then # Ubuntu / Debian
+        elif [[ -f "/etc/lsb-release" ]]; then # Ubuntu / OpenKylin2.0
             LINUX_OS="Ubuntu"
         fi
     fi
diff --git a/plugins/project/project/template/CMakeLists.txt.PROJ b/plugins/project/project/template/CMakeLists.txt.PROJ
@@ -54,7 +54,17 @@ if(WIN)
 elseif(LINUX)
     set(OS_TYPE "linux")
     add_definitions(-DLINUX)
-    set(CMAKE_PREFIX_PATH "/usr/lib64/cmake/Qt5")
+
+    if("${LINUX_OS}" STREQUAL "CentOS")
+        set(CMAKE_PREFIX_PATH "/usr/lib64/cmake/Qt5")
+    elseif("${LINUX_OS}" STREQUAL "Ubuntu")
+        set(CMAKE_PREFIX_PATH "/usr/lib/x86_64-linux-gnu/cmake")
+    endif(LINUX_OS)
+    message("CMAKE_PREFIX_PATH = ${CMAKE_PREFIX_PATH}")
+
+    if(WITH_QT)
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+    endif(WITH_QT)
 
 elseif(OSX)
     set(APPLE ON)
diff --git a/tools/env-apt.sh b/tools/env-apt.sh
@@ -1,5 +1,6 @@
 #!/bin/bash
-# satrt docker:
+# Support OS: ubuntu/OpenKylin2.0
+# start docker:
 # Windows: docker run -it -d --shm-size=2g --network=host -v D:\Research:/opt/shared_dir ubuntu2204:v1.0 /bin/bash
 # Linux: docker run -it -d --shm-size=2g --network=host -v $HOME/dockers/shared_dir:/opt/shared_dir ubuntu2204-dev-v1.0 --privileged ubuntu2204:v1.0 /bin/bash
 # docker exec -it a3822da6accba9625129bc63c9fe0001367a7282a7eda0d50783ab90e75c7513 /bin/bash
@@ -11,6 +12,11 @@
 
 # echo color: https://www.cnblogs.com/unclemac/p/12783387.html
 
+# vmware load shared dir: 
+# temp: sudo mkdir /mnt/hgfs && sudo mount -t fuse.vmhgfs-fuse .host:/ /mnt/hgfs -o allow_other
+# forever: vim /etc/fstab 
+# add info: .host:/ /mnt/hgfs fuse.vmhgfs-fuse allow_other, defaults 0 0
+
 OS=`uname`
 ANDROID_SDK_HOME="/usr/lib/android-sdk"
 ANDROID_NDK_HOME="$ANDROID_SDK_HOME/ndk"
@@ -107,7 +113,7 @@ function android_ndk() {
 setup_source
 setup_cert
 setup_soft
-setup_pip
+# setup_pip
 java_env
 android_sdk
-android_ndk
+android_ndk

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+## [2025.04.06] - v1.1.1.2`
	`2`	`+### [Optimize] cmake scripts for linux`
`1`	`3`
`2`	`4`	`## [2025.04.05] - v1.1.1.1`
`3`	`5`	`### [Optimize] windows package section and doc`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ void QDAHelpDialog::OnHelpShow()`
`30`	`30`	`void QDAHelpDialog::OnShowVersion()`
`31`	`31`	`{`
`32`	`32`	`std::string version = u8R"(`
`33`		`-版本号(Version) : v1.1.1.1`
	`33`	`+版本号(Version) : v1.1.1.2`
`34`	`34`
`35`		`-日期(Date) : 2025/03/27`
	`35`	`+日期(Date) : 2025/04/06`
`36`	`36`	`)";`
`37`	`37`	`QMessageBox::information(NULL, QStringLiteral("Version"), QString::fromStdString(version));`
`38`	`38`	`}`