From d4db78423cc0251d9dbca2e2f2a5a7a03766d231 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Mon, 2 Oct 2023 15:04:46 -0400 Subject: [PATCH 1/7] Bumped openddw to the latest commit. --- thirdparty/OpenDDW | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/OpenDDW b/thirdparty/OpenDDW index 5814b2c..8753ddf 160000 --- a/thirdparty/OpenDDW +++ b/thirdparty/OpenDDW @@ -1 +1 @@ -Subproject commit 5814b2cb03cdbc99fb718e10ba80f97efe4dee83 +Subproject commit 8753ddf6bc50784af92d04a1b69ecd16908f904c From 7f594781a3ec989c6d36bd1447c6edb194b06f94 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Mon, 2 Oct 2023 15:53:00 -0400 Subject: [PATCH 2/7] Bump VS package version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e8bf03c..107c57c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: uses: lukka/run-vcpkg@v10 with: vcpkgDirectory: '${{ github.workspace }}/vcpkg' - vcpkgGitCommitId: 688ece714204fb5e9ad790ad9ad6d9f571d2b032 + vcpkgGitCommitId: 9edb1b8e590cc086563301d735cae4b6e732d2d2 runVcpkgInstall: true # Set Up Build Environments From 7a6f1a8807776c8293bc33a6322f28e55c2d81cf Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Tue, 3 Oct 2023 09:14:40 -0400 Subject: [PATCH 3/7] Fix cmake to work with currend openddw. --- CMakeLists.txt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4d35e99..6d69c7a 100644 --- 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$<$:d>.lib) - set(QWT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/qwt/src) + set(QWT_LIBRARY ${PROJECT_SOURCE_DIR}/qwt/lib/qwt$<$: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) From 79147761308c03942b9cd04516e378a31ed0cc97 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Tue, 3 Oct 2023 10:35:10 -0400 Subject: [PATCH 4/7] Fixed the test. --- test/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index b3f26d9..316d31b 100644 --- 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 ) add_executable(unmanaged_testapp @@ -45,4 +46,5 @@ target_link_libraries(unmanaged_testapp target_include_directories(unmanaged_testapp PRIVATE ../src + ../thirdparty/OpenDDW ) From 39c18f7abd650b19d6255f73648b9bebee854cd1 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Tue, 3 Oct 2023 11:14:42 -0400 Subject: [PATCH 5/7] One more tweak --- test/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 316d31b..c56b21a 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,7 +22,7 @@ target_link_libraries(managed_testapp target_include_directories(managed_testapp PRIVATE ../src - ../thirdparty/OpenDDW + ../thirdparty/OpenDDW/src ) add_executable(unmanaged_testapp @@ -46,5 +46,5 @@ target_link_libraries(unmanaged_testapp target_include_directories(unmanaged_testapp PRIVATE ../src - ../thirdparty/OpenDDW + ../thirdparty/OpenDDW/src ) From 1b656a5da4bcac1db83b2eb94bd65fb0f335db8f Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Mon, 9 Oct 2023 14:40:56 -0400 Subject: [PATCH 6/7] Dumped openddw version again. --- thirdparty/OpenDDW | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/thirdparty/OpenDDW b/thirdparty/OpenDDW index 8753ddf..fb783cc 160000 --- a/thirdparty/OpenDDW +++ b/thirdparty/OpenDDW @@ -1 +1 @@ -Subproject commit 8753ddf6bc50784af92d04a1b69ecd16908f904c +Subproject commit fb783cc220de8a11666294464f21a53bea7ae49d From 16e8840314096215cf57ecc7e320df5692534164 Mon Sep 17 00:00:00 2001 From: Douglas Ayers Date: Tue, 10 Oct 2023 16:03:51 -0400 Subject: [PATCH 7/7] Removed unnecessary unmanaged include dependency. --- test/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index c56b21a..967cf34 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -46,5 +46,4 @@ target_link_libraries(unmanaged_testapp target_include_directories(unmanaged_testapp PRIVATE ../src - ../thirdparty/OpenDDW/src )