Merge pull request #35 from OpenDDS/fix-qt-brew

Update Qt package name for macOS
OpenDDS · Aug 9, 2024 · 8246712 · 8246712
2 parents 20e0709 + c97754e
commit 8246712
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,6 +10,7 @@ on:
       - latest-release
   schedule:
     - cron: '10 0 * * 0'
+  workflow_dispatch:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -70,7 +71,7 @@ jobs:
       - name: 'Install xerces, qt5, and qwt (macOS)'
         if: runner.os == 'macOS'
         run: |-
-          brew install xerces-c qt5 qwt-qt5
+          brew install xerces-c qt@5 qwt-qt5
       - name: setup for run-vcpkg
         if: runner.os == 'Windows'
         shell: cmd
@@ -234,7 +235,7 @@ jobs:
           cd build
           CMAKE_ARGS=""
           if [ '${{ runner.os }}' == 'macOS' ]; then
-            CMAKE_ARGS+=" -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5"
+            CMAKE_ARGS+=" -DQt5_DIR=$(brew --prefix qt@5)/lib/cmake/Qt5"
           fi
           cmake $CMAKE_ARGS ..
           cmake --build . -t all -t managed_testapp -t unmanaged_testapp

diff --git a/src/dynamic_meta_struct.cpp b/src/dynamic_meta_struct.cpp
@@ -33,7 +33,7 @@ OpenDDS::DCPS::Value DynamicMetaStruct::getValue(const void*, const char*) const
 
 //------------------------------------------------------------------------------
 OpenDDS::DCPS::Value DynamicMetaStruct::getValue(
-    OpenDDS::DCPS::Serializer&, const char* fieldSpec, const OpenDDS::DCPS::TypeSupportImpl*) const
+    OpenDDS::DCPS::Serializer&, const char* fieldSpec, OpenDDS::DCPS::TypeSupportImpl*) const
 {
     if (!m_sample)
     {

diff --git a/src/dynamic_meta_struct.h b/src/dynamic_meta_struct.h
@@ -48,7 +48,8 @@ class DynamicMetaStruct : public OpenDDS::DCPS::MetaStruct
      * @param[in] unusedSerializer Unused but required by MetaStruct.
      * @param[in] fieldSpec The topic member name.
      */
-    OpenDDS::DCPS::Value getValue(OpenDDS::DCPS::Serializer& unusedSerializer, const char* fieldSpec, const OpenDDS::DCPS::TypeSupportImpl*) const;
+    OpenDDS::DCPS::Value getValue(OpenDDS::DCPS::Serializer& unusedSerializer, const char* fieldSpec,
+                                  OpenDDS::DCPS::TypeSupportImpl*) const;
 
     /**
      * @brief OpenDDS before version 3.24 uses a 2-argument getValue()

diff --git a/src/topic_replayer.cpp b/src/topic_replayer.cpp
@@ -4,6 +4,8 @@
 #include "dds_data.h"
 #include "qos_dictionary.h"
 
+#include <dds/DCPS/EncapsulationHeader.h>
+
 #include <QDateTime>
 #include <iostream>