Skip to content

Commit a30d1d0

Browse files
committed
Restore OPENDDS_XERCES3 removed in parent commit
Continue to provide OPENDDS_XERCES3 even though it shouldn't be needed when using the toolchain file. When there is no OPENDDS_XERCES3 value set, it runs _opendds_find_xerces_for_ace() which doesn't work with the format of XercesC_LIBRARY from find_package(). optimized;D:/a/OpenDDS/OpenDDS/vcpkg/installed/x64-windows/lib/xerces-c_3.lib;debug;D:/a/OpenDDS/OpenDDS/vcpkg/installed/x64-windows/debug/lib
1 parent 4a36682 commit a30d1d0

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/cmake.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -354,6 +354,7 @@ jobs:
354354
-DOPENDDS_COMPILE_WARNINGS=WARNING^
355355
-DOPENDDS_ACE_TAO_SRC=${{ github.workspace }}\OpenDDS\build\ACE_TAO^
356356
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
357+
-DOPENDDS_XERCES3=${{ env.VCPKG_INSTALLED_DIR }}/x64-windows^
357358
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_TOOLCHAIN_FILE }}^
358359
-DOPENDDS_SECURITY=TRUE^
359360
-DOPENDDS_BUILD_TESTS=TRUE^
@@ -415,6 +416,7 @@ jobs:
415416
-DOPENDDS_COMPILE_WARNINGS=WARNING^
416417
-DOPENDDS_ACE_TAO_SRC=${{ github.workspace }}\OpenDDS\build\ACE_TAO^
417418
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
419+
-DOPENDDS_XERCES3=${{ env.VCPKG_INSTALLED_DIR }}/x64-windows^
418420
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_TOOLCHAIN_FILE }}^
419421
-DOPENDDS_SECURITY=TRUE^
420422
-DOPENDDS_BUILD_TESTS=TRUE^
@@ -473,6 +475,7 @@ jobs:
473475
-DOPENDDS_COMPILE_WARNINGS=WARNING^
474476
-DOPENDDS_ACE_TAO_SRC=${{ github.workspace }}\OpenDDS\build\ACE_TAO^
475477
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
478+
-DOPENDDS_XERCES3=${{ env.VCPKG_INSTALLED_DIR }}/x64-windows^
476479
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_TOOLCHAIN_FILE }}^
477480
-DOPENDDS_SECURITY=TRUE^
478481
-DOPENDDS_BUILD_TESTS=TRUE^
@@ -530,6 +533,7 @@ jobs:
530533
-DOPENDDS_COMPILE_WARNINGS=WARNING^
531534
-DOPENDDS_ACE_TAO_SRC=${{ github.workspace }}\OpenDDS\build\ACE_TAO^
532535
-DOPENDDS_MPC=${{ github.workspace }}\MPC^
536+
-DOPENDDS_XERCES3=${{ env.VCPKG_INSTALLED_DIR }}/x64-windows^
533537
-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_TOOLCHAIN_FILE }}^
534538
-DOPENDDS_SECURITY=TRUE^
535539
-DOPENDDS_BUILD_TESTS=TRUE^

0 commit comments

Comments
 (0)