Fix darwin ci.

Update documentation.

Signed-off-by: Alexander Wenzel <[email protected]>

.gitignore

@@ -1,13 +1,11 @@
 .gitconfig
 CMakeLists.txt.user
-*.pro.user
 build/
 .project
 Makefile
 buildlib/
 release/
 .cproject
-*.pro.user*
 .settings
 *.orig
 *~

INSTALL.md

@@ -6,7 +6,7 @@ Alexander Wenzel <[email protected]>
 
 * Install Qt5 SDK and Qt6 SDK including Qt Creator and Microsoft Visual Studio Build Tools 2019
 * Tested with QT 5.15.2 (Windows), QT 6.7.3 (Windows), and Qt 5.15.13 (Ubuntu 24.04LTS Linux)
-* Open project BuildDltViewer.pro in Qt Creator.
+* Open project CMakeLists.txt in Qt Creator.
 * Ensure that build options point to correct QT and MSVC.
 * Build Release in Qt Creator or via CMake (see last).
 * Optional Linux: set the library path in Qt Creator: Add variable to Projects/Build Settings/Build Environment: LD_LIBRARY_PATH = .
@@ -19,7 +19,7 @@ Alexander Wenzel <[email protected]>
 * sudo apt install libqt5serialport5-dev
 * mkdir build
 * cd build
-* qmake ../BuildDltViewer.pro
+* cmake ..
 * make
 * sudo make install
 * sudo ldconfig
@@ -129,6 +129,7 @@ Steps to follow:
 
 * mkdir build
 * cd build
+* TODO: Change to cmake
 * <path to Qt folder>/Qt/5.X/gcc_64/bin/qmake <path to BuildDltViewer.pro>/BuildDltViewer.pro -r
 * make
 

doc/dlt_viewer_plugins_programming_guide.txt

@@ -146,6 +146,7 @@ Q_EXPORT_PLUGIN2(dummyplugin, DummyPlugin);
 #endif
 ----
 
+TODO: Use cmake file instead.
 .dummyplugin.pro
 ----
 # include global settings for all DLT Viewer Plugins

doc/dlt_viewer_user_manual.tex

@@ -2104,6 +2104,7 @@ \subsection{Linux}
 
 \subsubsection{qmake}
 
+TODO: Use cmake file instead.
 Now add the plugin to plugins/plugin.pro
 
 \begin{verbatim}
@@ -2112,6 +2113,7 @@ \subsubsection{qmake}
 
 Build the Viewer:
 \begin{verbatim}
+TODO: Use cmake file instead.
 qmake BuildDltViewer.pro
 make
 \end{verbatim}
@@ -2161,6 +2163,7 @@ \subsubsection{Build qwt}
 C:\Qwt-6.1.3_2015_5.8_64bit
 \end{verbatim}
 
+TODO: Use cmake file instead.
 \subsubsection{Build Viewer using qmake}
 
 Now add the plugin to plugins/plugin.pro

scripts/darwin/build_cmake.sh

@@ -11,17 +11,17 @@ rm -rf "${SRC_DIR}/build"
 mkdir -p "${BUILD_DIR}"
 cd "${BUILD_DIR}"
 
-#if [[ $(uname -m) == 'arm64' ]]; then
-#  Qt5_DIR="/opt/homebrew/opt/qt@5"
-#  echo "Build with cmake $(uname -m) $Qt5_DIR"
+if [[ $(uname -m) == 'arm64' ]]; then
+  Qt5_DIR="/opt/homebrew/opt/qt@5"
+  echo "Build with cmake $(uname -m) $Qt5_DIR"
 #  qmake ../BuildDltViewer.pro
 #  cmake ..
-#else
-#  Qt5_DIR="/usr/local/opt/qt"
-#  echo "Build with qmake $(uname -m) $Qt5_DIR"
+else
+  Qt5_DIR="/usr/local/opt/qt"
+  echo "Build with qmake $(uname -m) $Qt5_DIR"
 #  qmake ../BuildDltViewer.pro
 #  make
-#fi
+fi
 
 #make
 

sdk/create_sdk.bat

@@ -50,8 +50,3 @@ copy %BUILD_DIR%\libqdlt.a %TARGET_DIR%\sdk\lib
 copy %SOURCE_DIR%\plugin\dummyviewerplugin %TARGET_DIR%\sdk\src\dummyviewerplugin
 copy %SOURCE_DIR%\plugin\dummydecoderplugin %TARGET_DIR%\sdk\src\dummydecoderplugin
 copy %SOURCE_DIR%\plugin\dummycontrolplugin %TARGET_DIR%\sdk\src\dummycontrolplugin
-
-copy %SOURCE_DIR%\sdk\BuildPlugins.pro %TARGET_DIR%\sdk\src
-copy %SOURCE_DIR%\sdk\dummydecoderplugin.pro %TARGET_DIR%\sdk\src\dummydecoderplugin
-copy %SOURCE_DIR%\sdk\dummyviewerplugin.pro %TARGET_DIR%\sdk\src\dummyviewerplugin
-copy %SOURCE_DIR%\sdk\dummycontrolplugin.pro %TARGET_DIR%\sdk\src\dummycontrolplugin