stable/2025: window-clang and windows-v142: copy changes from master.

coin-or · Jan 11, 2025 · 0f74f0f · 0f74f0f
1 parent 6a0573a
commit 0f74f0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/conda-windows-clang.yml b/.github/workflows/conda-windows-clang.yml
@@ -35,9 +35,10 @@ jobs:
         activate-environment: cppad
         environment-file: .github/workflows/conda/conda-env.yml
         python-version: 3.7
-    - name: Install cmake and update conda
+    - name: Install cmake , pkgconfig, and update conda
       run: |
         conda install cmake -c main
+        conda install pkgconfig -c conda-forge
     - name: Build CppAD
       shell: cmd /C CALL {0}
       env:
@@ -49,8 +50,6 @@ jobs:
         set BOOST_ROOT_1_72_0=
         set PATH=%PATH:C:\hostedtoolcache\windows\Boost\1.72.0;=%
 
-        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-
         :: Create build directory
         mkdir build
         pushd build

diff --git a/.github/workflows/conda-windows-v142.yml b/.github/workflows/conda-windows-v142.yml
@@ -34,9 +34,10 @@ jobs:
         activate-environment: cppad
         environment-file: .github/workflows/conda/conda-env.yml
         python-version: 3.7
-    - name: Install cmake and update conda
+    - name: Install cmake , pkgconfig and update conda
       run: |
         conda install cmake -c main
+        conda install pkgconfig -c conda-forge
 
     - name: Build CppAD
       shell: cmd /C CALL {0}
@@ -49,8 +50,6 @@ jobs:
         set BOOST_ROOT_1_72_0=
         set PATH=%PATH:C:\hostedtoolcache\windows\Boost\1.72.0;=%
 
-        call "%programfiles(x86)%\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" amd64
-
         :: Create build directory
         mkdir build
         pushd build