From 06a717f11f92e57b371441718919dfdc2f2dc61a Mon Sep 17 00:00:00 2001
From: Brad Bell <bradbell@seanet.com>
Date: Fri, 9 Aug 2024 04:20:54 -0700
Subject: [PATCH] master: fixing more workflow problems.
 conda-windows-eigen.yml: change PGK -> PKG. cppad_vector.cpp: Test does not
 compile in _MSG_VER of CPPAD_CXX_IS_XCODE cases.

---
 .github/workflows/conda-windows-eigen.yml | 10 ++++++----
 test_more/general/cppad_vector.cpp        |  2 ++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/conda-windows-eigen.yml b/.github/workflows/conda-windows-eigen.yml
index 50a9d3bcb..5dbcde3bf 100644
--- a/.github/workflows/conda-windows-eigen.yml
+++ b/.github/workflows/conda-windows-eigen.yml
@@ -15,19 +15,21 @@ jobs:
       with:
         activate-environment: conda_env
 
-    - name: Use conda to install eigen
+    - name: Use conda to install eigen and pkgconfig
       shell: cmd /C CALL {0}
       run: |
         echo conda install --yes eigen pkgconfig
              conda install --yes eigen pkgconfig
 
-    - name: Check location of Eigen directory
+    - name: Create and check Eigen link, check for eigen3.pc
       shell: cmd /C CALL {0}
       run: |
         mklink /d %CONDA_PREFIX%\Library\include\Eigen^
                   %CONDA_PREFIX%\Library\include\eigen3\Eigen
         echo dir %CONDA_PREFIX%\Library\include\Eigen\Core
              dir %CONDA_PREFIX%\Library\include\Eigen\Core
+        echo dir %CONDA_PREFIX%\Library\share\pkgconfig\eigen3.pc
+             dir %CONDA_PREFIX%\Library\share\pkgconfig\eigen3.pc
 
     - name: Build and test CppAD with Eigen
       shell: cmd /C CALL {0}
@@ -40,8 +42,8 @@ jobs:
              mkdir build
         echo cd build
              cd build
-        echo set PGK_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig
-             set PGK_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig
+        echo set PKG_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig
+             set PKG_CONFIG_PATH=%CONDA_PREFIX%\Library\share\pkgconfig
         echo run cmake
         cmake ^
           -D CMAKE_CXX_COMPILER=cl ^
diff --git a/test_more/general/cppad_vector.cpp b/test_more/general/cppad_vector.cpp
index 4e3ab4d39..d0d13e47b 100644
--- a/test_more/general/cppad_vector.cpp
+++ b/test_more/general/cppad_vector.cpp
@@ -68,6 +68,7 @@ bool test_reverse(void)
    return ok;
 }
 
+# if ! defined(_MSC_VER) && ! CPPAD_CXX_IS_XCODE
 bool test_sort(void)
 {  // copy requires a random access iterator
    bool ok = true;
@@ -84,6 +85,7 @@ bool test_sort(void)
    //
    return ok;
 }
+# endif
 
 
 } // END_EMPTY_NAMESPACE