Skip to content

Commit

Permalink
master: fixing more workflow problems.
Browse files Browse the repository at this point in the history
conda-windows-eigen.yml: change PGK -> PKG.
cppad_vector.cpp: Test does not compile in _MSG_VER of CPPAD_CXX_IS_XCODE cases.
  • Loading branch information
bradbell committed Aug 9, 2024
1 parent 14ae031 commit 06a717f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
10 changes: 6 additions & 4 deletions .github/workflows/conda-windows-eigen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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 ^
Expand Down
2 changes: 2 additions & 0 deletions test_more/general/cppad_vector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -84,6 +85,7 @@ bool test_sort(void)
//
return ok;
}
# endif


} // END_EMPTY_NAMESPACE
Expand Down

0 comments on commit 06a717f

Please sign in to comment.