WIP

pablode · Feb 9, 2024 · c7033a5 · c7033a5
1 parent 5f6456c
commit c7033a5
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 8 deletions.
diff --git a/.github/workflows/build-houdini20.yml b/.github/workflows/build-houdini20.yml
@@ -31,6 +31,7 @@ jobs:
           usd-download-url: "https://github.com/pablode/USD/releases/download/houdini20.0-ci-release/USD23.08_Windows_x64.tar.gz"
           usd-install-path: "C:/INSTALL"
           archive-file-name: "gatling_Houdini20_Windows_x64.tar.gz"
+          cmake-params: -G"Visual Studio 16 2019" -Ax64
 
     uses: ./.github/workflows/build.yml
     with:
@@ -42,5 +43,5 @@ jobs:
       archive-name: build-Release-${{ github.sha }}
       archive-file-name: ${{ matrix.archive-file-name }}
       mdl-sdk-cache-key: ${{ inputs.mdl-sdk-cache-key-prefix }}_${{ matrix.image }}
-      cmake-params: -DPLUGINFO_LIBPATH_PREFIX=../../usd
+      cmake-params: ${{ matrix.cmake-params }} -DPLUGINFO_LIBPATH_PREFIX=../../usd
       houdini-packaging: true
diff --git a/.github/workflows/build-usd.yml b/.github/workflows/build-usd.yml
@@ -56,7 +56,7 @@ jobs:
           usd-install-path: "C:/INSTALL"
           upload-archive: ${{ inputs.upload-archives }}
           archive-file-name: "gatling_USD${{ inputs.usd-version }}_Windows_x64_Python3.7.tar.gz"
-          cmake-params:
+          cmake-params: -G"Visual Studio 16 2019" -Ax64
 
     uses: ./.github/workflows/build.yml
     with:

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -77,14 +77,14 @@ jobs:
     # We need to put the USD libs in the PATH because we build against USD's MaterialX
     # distribution. The libs are shared and loaded for gi_test's ctest discovery.
     - name: Set up USD environment variables (Windows)
-      if: matrix.os-family == 'Windows'
+      if: runner.os == 'Windows'
       run: |
         # Need to use real Windows paths instead of MSYS2's auto-converted Unix paths
         echo "$(pwd -W)/${{ inputs.usd-install-path }}/lib" >> $GITHUB_PATH
         echo "$(pwd -W)/${{ inputs.usd-install-path }}/bin" >> $GITHUB_PATH
 
     - name: Set up USD environment variables (Linux)
-      if: matrix.os-family == 'Linux'
+      if: runner.os == 'Linux'
       run: echo "LD_LIBRARY_PATH=$PWD/${{ inputs.usd-install-path }}/lib" >> $GITHUB_ENV
 
     - name: Create temporary folders
@@ -99,9 +99,10 @@ jobs:
         fail-on-cache-miss: true
 
     - name: Install NASM
-      if: matrix.name == 'Windows'
+      if: runner.os == 'Windows'
       uses: ilammy/setup-nasm@v1.4.0
 
+    # TODO: check if NASM is actually used
     - name: Generate build system files using CMake
       working-directory: BUILD
       run: |
@@ -116,6 +117,25 @@ jobs:
       working-directory: BUILD
       run: cmake --build . --config ${{ inputs.build-config }} -j 2 --target hdGatling gatling gi_test
 
+    - name: Set up MSVC environment (Windows)
+      if: runner.os == 'Windows'
+      uses: ilammy/msvc-dev-cmd@v1.12.0
+      with:
+        vsversion: 2019
+
+    - name: (TMP) Check gi_test.exe dependencies
+      if: runner.os == 'Windows' && always()
+      working-directory: BUILD
+      shell: cmd
+      run: |
+        dumpbin /DEPENDENTS bin/gi_test.exe
+
+    - name: exec gi_test.exe
+      if: runner.os == 'Windows' && always()
+      working-directory: BUILD
+      run: |
+        ./bin/gi_test.exe
+
     - name: Install gatling
       working-directory: BUILD
       run: cmake --install . --config ${{ inputs.build-config }} --component hdGatling

diff --git a/src/gi/CMakeLists.txt b/src/gi/CMakeLists.txt
@@ -76,9 +76,9 @@ target_compile_definitions(
 )
 
 # Expose tests using ctest for IDE integration
-include(CTest)
-include("${DOCTEST_SCRIPT_PATH}")
-doctest_discover_tests(gi_test WORKING_DIRECTORY "${OUTPUT_DIR}")
+#include(CTest)
+#include("${DOCTEST_SCRIPT_PATH}")
+#doctest_discover_tests(gi_test WORKING_DIRECTORY "${OUTPUT_DIR}")
 
 install(
   FILES "${MDL_SHARED_LIB}"