Added linux deploy for cmake

grodansparadis · Jan 28, 2025 · e9afb29 · e9afb29
1 parent 9b4503b
commit e9afb29
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,3 +20,6 @@ vscp-works-qt.sln
 vscp-works-qt.vcxproj
 vscp-works-qt.vcxproj.filters
 DistributionKit/
+deploy-qt-.cmake
+deploy-qt-linux.cmake
+deploy-qt-windows.cmake
diff --git a/README.md b/README.md
@@ -57,6 +57,7 @@ You need expat, mosquitto, openssl and libcurl to build this project
   mkdir build
   cd build
   cmake -DCMAKE_PREFIX_PATH=~/Qt/6.8.1/gcc_64 ..
+  make  
 ```
 
 where **CMAKE_PREFIX_PATH** should point to the Qt version you installed previously

diff --git a/deploy-qt-linux.cmake.in b/deploy-qt-linux.cmake.in
@@ -0,0 +1,6 @@
+set(LINUXDEPLOYQT "@LINUXDEPLOYQT@")
+set(COMPONENT_NAME_MAIN "@COMPONENT_NAME_MAIN@")
+set(CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@")
+
+
+execute_process(COMMAND ${LINUXDEPLOYQT} --qmldir ${CMAKE_CURRENT_SOURCE_DIR} ${COMPONENT_NAME_MAIN}/data/bin WORKING_DIRECTORY ${CPACK_TEMPORARY_INSTALL_DIRECTORY}/packages)  
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -436,7 +436,7 @@ MainWindow::checkRemoteEventDbVersion()
     QString path = pworks->m_shareFolder;
     path += "vscp_events.sqlite3";
 
-    // If there is a newer version we should download it
+    // If there is a newer version or it does not exist we should download it
     if (!QFile::exists(path) ||
         (pworks->m_lastEventDbServerDateTime.toSecsSinceEpoch() >
          pworks->m_lastEventDbLoadDateTime.toSecsSinceEpoch())) {

diff --git a/src/vscpworks.cpp b/src/vscpworks.cpp
@@ -327,7 +327,7 @@ vscpworks::loadSettings(void)
 
   fprintf(stderr, "Loading application data\n");
 
-  // If the database don't exist, bail out
+  // If the config file does't exist, bail out after writing defaults
   if (!QFile::exists(m_configFile)) {
     writeSettings();
     if (!QFile::exists(m_configFile)) {
@@ -747,7 +747,7 @@ vscpworks::loadEventDb(void)
   QString dbpath = m_shareFolder;
   dbpath += "vscp_events.sqlite3";
 
-  // If the database don't exist, bail out
+  // If the database does not exist, bail out
   if (!QFile::exists(dbpath)) {
     QString err = QString(tr("The VSCP event database does not exist. Is it available? [%s]")).arg(dbpath);
     fprintf(stderr, "%s", err.toStdString().c_str());