Merge remote-tracking branch 'proplib-template/main' into cross-platf…

…orm-cli-driver
NTIA · Nov 12, 2024 · 352cf6f · 352cf6f
2 parents 3f60ff9 + 26320fe
commit 352cf6f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/.github/workflows/ctest.yml b/.github/workflows/ctest.yml
@@ -1,5 +1,4 @@
-# This action compiles the library and runs all unit tests using an OS and CMake matrix
-# Doxygen documentation is also built. Build fails on missing documentation.
+# This action compiles the library and driver and runs all unit tests using an OS and CMake matrix
 name: Unit Tests
 
 on:
@@ -27,22 +26,17 @@ jobs:
     - name: Clone required submodules
       run: |
         git submodule init extern/googletest
-        git submodule init extern/doxygen-awesome-css
         git submodule update
 
     - name: Install CMake
       uses: lukka/get-cmake@latest
       with:
         cmakeVersion: ${{ matrix.cmakeVersion }}
-
-    - name: Install Doxygen
-      uses: ssciwr/doxygen-install@v1
-      with:
-        version: "1.12.0"
 
     - name: "CMake: Build and Test"
       uses: lukka/run-cmake@v10
       with:
         configurePreset: release
+        configurePresetAdditionalArgs: "['-DBUILD_DOCS=OFF']"
         buildPreset: release
         testPreset: release
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -5,7 +5,6 @@ name: Create Release Artifacts
 on:
   push:
     tags: ['v[0-9]+.*']
-  workflow_dispatch:
 
 permissions:
   contents: write
@@ -28,7 +27,7 @@ jobs:
         uses: lukka/run-cmake@v10
         with:
           configurePreset: release
-          configurePresetAdditionalArgs: "['-DBUILD_DOCS=OFF', '-DRUN_TESTS=OFF']"
+          configurePresetAdditionalArgs: "['-DBUILD_DOCS=OFF', '-DRUN_TESTS=OFF', '-DRUN_DRIVER_TESTS=OFF']"
           buildPreset: release
 
       - name: Upload release artifact (macOS or Linux)
@@ -39,14 +38,18 @@ jobs:
           path: |
             ${{ github.workspace }}/bin/*.dylib
             ${{ github.workspace }}/bin/*.so
+            ${{ github.workspace }}/bin/*Driver-Darwin-*
+            ${{ github.workspace }}/bin/*Driver-Linux-*
           if-no-files-found: error
           overwrite: true
 
       - name: Upload release artifact (Windows)
-        if: matrix.os == 'Windows'
+        if: runner.os == 'Windows'
         uses: actions/upload-artifact@v4
         with:
           name: release-${{ matrix.os }}
-          path: ${{ github.workspace }}\bin\Debug\*.dll
+          path: |
+            ${{ github.workspace }}\bin\Release\*.dll
+            ${{ github.workspace }}\bin\Release\*Driver-Windows-*.exe
           if-no-files-found: error
           overwrite: true
diff --git a/app/src/CMakeLists.txt b/app/src/CMakeLists.txt
@@ -33,7 +33,7 @@ add_definitions(-DDRIVER_NAME="${DRIVER_NAME}")
 # Set some target metadata
 set_target_properties(
     ${DRIVER_NAME} PROPERTIES
-    OUTPUT_NAME ${DRIVER_NAME}-${DRIVER_VERSION}
+    OUTPUT_NAME ${DRIVER_NAME}-${CMAKE_SYSTEM_NAME}-${DRIVER_VERSION}
     LIBRARY_OUTPUT_DIRECTORY ${DRIVER_EXE_DIR}
     ARCHIVE_OUTPUT_DIRECTORY ${DRIVER_EXE_DIR}
     RUNTIME_OUTPUT_DIRECTORY ${DRIVER_EXE_DIR}