Update git actions

.github/workflows/clang-format.yml

@@ -2,7 +2,7 @@ name: clang-format
 
 on:
   push:
-    branches: [master, litepcie-update]
+    branches: [develop]
   pull_request:
 
 jobs:

.github/workflows/cmake.yml

@@ -2,7 +2,7 @@ name: CMake
 
 on:
   push:
-    branches: [master, litepcie-update]
+    branches: [develop]
   pull_request:
 
 env:
@@ -17,9 +17,15 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os:
-          [ubuntu-latest, windows-latest]
-          # os: [ubuntu-latest, macos-latest, windows-latest]
+        include:
+          - os: ubuntu-latest
+            compiler: gcc
+          - os: ubuntu-latest
+            compiler: clang
+          - os: windows-latest
+            compiler: msvc
+          - os: macos-latest
+            compiler: clang
 
     steps:
       - uses: actions/checkout@v2
@@ -56,12 +62,16 @@ jobs:
           cmake --build . --target install
 
       - name: Configure CMake (windows)
-        if: matrix.os == 'windows-latest'
+        if: matrix.os == 'windows-latest' && matrix.compiler == 'msvc'
         run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} -DwxWidgets_ROOT_DIR=${{github.workspace}}/deps/wxWidgets -DFX3_SDK_PATH=${{github.workspace}}/deps/FX3SDK
 
-      - name: Configure CMake (linux)
-        if: matrix.os != 'windows-latest'
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}
+      - name: Configure CMake (gcc)
+        if: matrix.compiler == 'gcc'
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=g++ -DCMAKE_C_COMPILER=gcc -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}}
+
+      - name: Configure CMake (clang)
+        if: matrix.compiler == 'clang'
+        run: cmake -B ${{github.workspace}}/build -DCMAKE_CXX_COMPILER=clang++ -DCMAKE_C_COMPILER=clang -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_INSTALL_PREFIX=${{env.INSTALL_PREFIX}} 
 
       - name: Build
         run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}

.github/workflows/gtest.yml

@@ -2,7 +2,7 @@ name: GTest tests
 
 on:
   push:
-    branches: [master, litepcie-update]
+    branches: [develop]
   pull_request:
 
 env:

src/Si5351C/Si5351C.cpp

@@ -6,7 +6,7 @@
 
 #include "Si5351C.h"
 #include "Logger.h"
-#include <math.h>
+#include <cmath>
 #include <iomanip>
 #include <fstream>
 #include <set>

src/boards/LMS7002M_SDRDevice.cpp

@@ -734,7 +734,7 @@ uint16_t LMS7002M_SDRDevice::GetParameter(uint8_t moduleIndex, uint8_t channel,
     } catch (...)
     {
         // TODO: fix return
-        throw std::runtime_error("failure setting parameter: " + address);
+        throw std::runtime_error("failure setting parameter: " + std::to_string(address));
     }
 }
 

src/boards/LimeSDR_X3/LimeSDR_X3.cpp

@@ -647,7 +647,7 @@ OpStatus LimeSDR_X3::Configure(const SDRConfig& cfg, uint8_t socIndex)
 
 void LimeSDR_X3::ConfigureDirection(TRXDir dir, LMS7002M* chip, const SDRConfig& cfg, int ch, uint8_t socIndex)
 {
-    std::string dirName = dir == TRXDir::Rx ? "Rx" : "Tx";
+    const char* dirName = dir == TRXDir::Rx ? "Rx" : "Tx";
     SDRDevice::ChannelConfig::Direction trx = cfg.channel[ch].GetDirection(dir);
 
     if (socIndex == 1) // LMS2 uses external ADC/DAC

src/comms/PCIe/CMakeLists.txt

@@ -17,7 +17,7 @@ set(COMMS_LITE_PCIE_SOURCES
 ########################################################################
 include(FeatureSummary)
 include(CMakeDependentOption)
-cmake_dependent_option(ENABLE_LITE_PCIE "Enable Lite PCIe" ON "UNIX;ENABLE_LIBRARY" OFF)
+cmake_dependent_option(ENABLE_LITE_PCIE "Enable Lite PCIe" ON "UNIX;ENABLE_LIBRARY; NOT APPLE" OFF)
 add_feature_info(LITE_PCIE ENABLE_LITE_PCIE "PCIe support")
 if (NOT ENABLE_LITE_PCIE)
     return()

src/comms/USB/FT601/FT601.cpp

@@ -13,7 +13,7 @@ static const int CONTROL_BULK_READ_ADDRESS = 0x82;
 
 FT601::FT601(void* usbContext)
     : USBGeneric(usbContext)
-#ifdef __unix
+#ifdef __unix__
     , mUsbCounter(0)
 #else
     , mFTHandle(nullptr)

src/oglGraph/GLFont.cpp

@@ -6,7 +6,7 @@
 #include <vector>
 using namespace std;
 
-static constexpr bool IsGlew1_5()
+static bool IsGlew1_5()
 {
 #ifdef __GNUC__
     #pragma GCC diagnostic push

src/oglGraph/OpenGLGraph.cpp

@@ -34,7 +34,7 @@ const int OpenGLGraph::GLCanvasAttributes[8] = {
 
 bool OpenGLGraph::hasNotRecentEnoughOpenGLVersionWarningBeenThrownYet = false;
 
-static constexpr bool IsGlew1_5()
+static bool IsGlew1_5()
 {
 #ifdef __GNUC__
     #pragma GCC diagnostic push