Merge pull request #16 from doug1234/BumpOpenDDW

Bumped openddw to the latest commit.
OpenDDS · Oct 19, 2023 · 87e9d50 · 87e9d50
2 parents b689991 + 16e8840
commit 87e9d50
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -83,7 +83,7 @@ jobs:
         uses: lukka/run-vcpkg@v10
         with:
           vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-          vcpkgGitCommitId: 688ece714204fb5e9ad790ad9ad6d9f571d2b032
+          vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2
           runVcpkgInstall: true
 
       # Set Up Build Environments

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,11 +15,11 @@ endif()
 find_package(Qt5 REQUIRED COMPONENTS Core Widgets Gui PrintSupport Svg OpenGL OPTIONAL_COMPONENTS ${qt_optional_components})
 
 if(${QWT_IS_LOCAL})
-  set(QWT_LIBRARY ${CMAKE_SOURCE_DIR}/qwt/lib/qwt$<$<CONFIG:DEBUG>:d>.lib)
-  set(QWT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/qwt/src)
+  set(QWT_LIBRARY ${PROJECT_SOURCE_DIR}/qwt/lib/qwt$<$<CONFIG:DEBUG>:d>.lib)
+  set(QWT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/qwt/src)
 else()
   # FindQwt.cmake is in this directory
-  list(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
+  list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR})
   find_package(Qwt MODULE REQUIRED)
 endif()
 
@@ -137,6 +137,7 @@ target_link_libraries(monitor
 
 target_include_directories(monitor PRIVATE
   ${QWT_INCLUDE_DIR}
+  ${PROJECT_SOURCE_DIR}/thirdparty/OpenDDW/src
 )
 
 configure_file(opendds.ini . COPYONLY)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -22,6 +22,7 @@ target_link_libraries(managed_testapp
 
 target_include_directories(managed_testapp PRIVATE
   ../src
+  ../thirdparty/OpenDDW/src
 )
 
 add_executable(unmanaged_testapp

diff --git a/thirdparty/OpenDDW b/thirdparty/OpenDDW
-Original file line number
+Diff line change
@@ Expand Up / @@ -22,6 +22,7 @@ target_link_libraries(managed_testapp @@
     target_include_directories(managed_testapp PRIVATE
       ../src
+      ../thirdparty/OpenDDW/src
     )
     add_executable(unmanaged_testapp
@@ Expand Down @@
+5 −4		.github/workflows/build.yml
+67 −2		CMakeLists.txt
+223 −0		idl2library.cmake
+64 −0		openddw-config.in.cmake
+11 −11		src/dds_manager.cpp
+2 −2		src/dds_simple.h