Fix CI Issues

.github/workflows/build_and_test.yml

@@ -12690,8 +12690,8 @@ jobs:
         cmake --build build -- -j $(getconf _NPROCESSORS_ONLN)
     - name: Run Tests
       run: |
-        cd OpenDDS
-        cmake --build build -t test
+        cd OpenDDS/build
+        ctest
 
   build_cmake_u22_stat:
 
@@ -12731,8 +12731,8 @@ jobs:
         cmake --build build -- -j $(getconf _NPROCESSORS_ONLN)
     - name: Run Tests
       run: |
-        cd OpenDDS
-        cmake --build build -t test
+        cd OpenDDS/build
+        ctest
 
   build_cmake_u22_no_features:
 
@@ -12780,8 +12780,8 @@ jobs:
         cmake --build build
     - name: Run Tests
       run: |
-        cd OpenDDS
-        cmake --build build -t test
+        cd OpenDDS/build
+        ctest
 
   build_cmake_u22_android29:
 
@@ -12794,6 +12794,7 @@ jobs:
         path: OpenDDS
         submodules: true
     - uses: nttld/setup-ndk@v1
+      id: setup-ndk
       with:
         ndk-version: r25c
         add-to-path: false
@@ -12816,30 +12817,33 @@ jobs:
           -G Ninja \
           -DBUILD_SHARED_LIBS=FALSE \
           -DOPENDDS_JUST_BUILD_HOST_TOOLS=TRUE
-    - name: Configure
+    - uses: ammaraskar/[email protected]
+    - name: Build Host Tools
       run: |
         cd OpenDDS
-        cmake -B build-host \
+        cmake --build build-host
+    - name: Configure Target
+      run: |
+        cd OpenDDS
+        cmake -B build-target \
           -G Ninja \
           -DBUILD_SHARED_LIBS=TRUE \
           -DANDROID_ABI=armeabi-v7a -DANDROID_PLATFORM=android-29 \
           --toolchain ${{ steps.setup-ndk.outputs.ndk-path }}/build/cmake/android.toolchain.cmake \
           -DOPENDDS_CMAKE_VERBOSE=all \
           -DOPENDDS_HOST_TOOLS=$(realpath build-host)
-    - uses: ammaraskar/[email protected]
-    - name: Build Host Tools
-      run: |
-        cd OpenDDS
-        cmake --build build-host
-    - name: Build
+    - name: Build Target
       run: |
         cd OpenDDS
         cmake --build build-target
 
   build_cmake_w22:
 
+    runs-on: windows-2022
+
     needs: ACE_TAO_w22_p1
 
+    steps:
     - name: Checkout OpenDDS
       uses: actions/checkout@v3
       with:
@@ -12870,6 +12874,7 @@ jobs:
     - name: set up msvc env
       uses: ilammy/msvc-dev-cmd@v1
     - name: Configure
+      shell: cmd
       run: |
         cd OpenDDS
         cmake -B build^
@@ -12881,10 +12886,12 @@ jobs:
           -DOPENDDS_CMAKE_VERBOSE=all
     - uses: ammaraskar/[email protected]
     - name: Build
+      shell: cmd
       run: |
         cd OpenDDS
         cmake --build build
     - name: Run Tests
+      shell: cmd
       run: |
-        cd OpenDDS
-        cmake --build build -t RUN_TESTS
+        cd OpenDDS\build
+        ctest -C Debug

CMakeLists.txt

@@ -106,6 +106,7 @@ install(
     cmake/opendds_testing.cmake
     cmake/tao_group.cmake
     cmake/tao_idl_sources.cmake
+    cmale/opendds_version.cmake
     "${config_cmake}"
   DESTINATION "${cmake_dest}"
 )

tests/cmake/Nested_IDL/ecu.mpc

@@ -6,7 +6,7 @@ project(ECU): dcpsexe {
 
   TypeSupport_Files {
     idlflags += -I./engine -I./engine/engine_stats -I./transmission
-    idlflags += --filename-only-includes
+    idlflags += --filename-only-includes -DOPENDDS_FILENAME_ONLY_INCLUDES
     engine/engine_specs.idl
     engine/engine_stats/fuel_stats.idl
     transmission/transmission_specs.idl
@@ -16,6 +16,7 @@ project(ECU): dcpsexe {
 
   Idl_Files {
     idlflags += -I./engine -I./engine/engine_stats -I./transmission
+    idlflags += -DOPENDDS_FILENAME_ONLY_INCLUDES
     engine/engine_specs.idl
     engine/engine_stats/fuel_stats.idl
     transmission/transmission_specs.idl

tests/cmake/ace_tao_only/CMakeLists.txt

@@ -57,6 +57,10 @@ add_executable(${client} ${client_files})
 set_target_properties(${client} PROPERTIES OUTPUT_NAME MessengerClient)
 target_link_libraries(${client} ${idl})
 
-opendds_add_test(COMMAND perl run_test.pl)
+if(CMAKE_CONFIGURATION_TYPES)
+  opendds_add_test(COMMAND perl run_test.pl $<$<BOOL:$<CONFIG>>:-ExeSubDir> $<CONFIG>)
+else()
+  opendds_add_test(COMMAND perl run_test.pl)
+endif()
 
 _opendds_restore_cache()