From 01d0fef78f5b74e1ba6616295c05e894f2cb0bd1 Mon Sep 17 00:00:00 2001
From: Jeremy <51220084+jeremy-rifkin@users.noreply.github.com>
Date: Fri, 1 Sep 2023 18:17:25 -0400
Subject: [PATCH] Re-enable windows cmake integration tests

---
 .github/workflows/cmake-integration.yml | 121 ++++++++++++------------
 1 file changed, 60 insertions(+), 61 deletions(-)

diff --git a/.github/workflows/cmake-integration.yml b/.github/workflows/cmake-integration.yml
index c1665d2..6eed65f 100644
--- a/.github/workflows/cmake-integration.yml
+++ b/.github/workflows/cmake-integration.yml
@@ -99,64 +99,63 @@ jobs:
            make
            ./main
 
-    # TODO: Disabled for now. Build path issues.
-  # test-mingw-fetchcontent:
-  #   runs-on: windows-2019
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: test
-  #     run: |
-  #          $tag=$(git rev-parse --abbrev-ref HEAD)
-  #          cd ..
-  #          cp -Recurse cpptrace/test/fetchcontent-integration .
-  #          mkdir fetchcontent-integration/build
-  #          cd fetchcontent-integration/build
-  #          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag" -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles"
-  #          make
-  #          .\main.exe
-  # test-mingw-add_subdirectory:
-  #   runs-on: windows-2019
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: test
-  #     run: |
-  #          cd ..
-  #          cp -Recurse cpptrace/test/add_subdirectory-integration .
-  #          cp -Recurse cpptrace add_subdirectory-integration
-  #          mkdir add_subdirectory-integration/build
-  #          cd add_subdirectory-integration/build
-  #          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles"
-  #          make
-  #          .\main.exe
-  # test-windows-fetchcontent:
-  #   runs-on: windows-2019
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Enable Developer Command Prompt
-  #     uses: ilammy/msvc-dev-cmd@v1.10.0
-  #   - name: test
-  #     run: |
-  #          $tag=$(git rev-parse --abbrev-ref HEAD)
-  #          cd ..
-  #          cp -Recurse cpptrace/test/fetchcontent-integration .
-  #          mkdir fetchcontent-integration/build
-  #          cd fetchcontent-integration/build
-  #          cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag"
-  #          msbuild demo_project.sln
-  #          .\Debug\main.exe
-  # test-windows-add_subdirectory:
-  #   runs-on: windows-2019
-  #   steps:
-  #   - uses: actions/checkout@v2
-  #   - name: Enable Developer Command Prompt
-  #     uses: ilammy/msvc-dev-cmd@v1.10.0
-  #   - name: test
-  #     run: |
-  #          cd ..
-  #          cp -Recurse cpptrace/test/add_subdirectory-integration .
-  #          cp -Recurse cpptrace add_subdirectory-integration
-  #          mkdir add_subdirectory-integration/build
-  #          cd add_subdirectory-integration/build
-  #          cmake .. -DCMAKE_BUILD_TYPE=Debug
-  #          msbuild demo_project.sln
-  #          .\Debug\main.exe
+  test-mingw-fetchcontent:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - name: test
+      run: |
+           $tag=$(git rev-parse --abbrev-ref HEAD)
+           cd ..
+           cp -Recurse cpptrace/test/fetchcontent-integration .
+           mkdir fetchcontent-integration/build
+           cd fetchcontent-integration/build
+           cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag" -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles"
+           make
+           .\main.exe
+  test-mingw-add_subdirectory:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - name: test
+      run: |
+           cd ..
+           cp -Recurse cpptrace/test/add_subdirectory-integration .
+           cp -Recurse cpptrace add_subdirectory-integration
+           mkdir add_subdirectory-integration/build
+           cd add_subdirectory-integration/build
+           cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_BUILD_TYPE=g++ "-GUnix Makefiles"
+           make
+           .\main.exe
+  test-windows-fetchcontent:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - name: Enable Developer Command Prompt
+      uses: ilammy/msvc-dev-cmd@v1.10.0
+    - name: test
+      run: |
+           $tag=$(git rev-parse --abbrev-ref HEAD)
+           cd ..
+           cp -Recurse cpptrace/test/fetchcontent-integration .
+           mkdir fetchcontent-integration/build
+           cd fetchcontent-integration/build
+           cmake .. -DCMAKE_BUILD_TYPE=Debug -DCPPTRACE_TAG="$tag"
+           msbuild demo_project.sln
+           .\Debug\main.exe
+  test-windows-add_subdirectory:
+    runs-on: windows-2019
+    steps:
+    - uses: actions/checkout@v2
+    - name: Enable Developer Command Prompt
+      uses: ilammy/msvc-dev-cmd@v1.10.0
+    - name: test
+      run: |
+           cd ..
+           cp -Recurse cpptrace/test/add_subdirectory-integration .
+           cp -Recurse cpptrace add_subdirectory-integration
+           mkdir add_subdirectory-integration/build
+           cd add_subdirectory-integration/build
+           cmake .. -DCMAKE_BUILD_TYPE=Debug
+           msbuild demo_project.sln
+           .\Debug\main.exe