Skip to content

Commit 9ef42b5

Browse files
committed
Fix syntax for installing docs deps from conda environment file
Update conda recipe build scripts to avoid setting parameters set by conda via CMAKE_ARGS Use lower case language when calling yggcompile in cmake
1 parent df4d86a commit 9ef42b5

File tree

4 files changed

+16
-11
lines changed

4 files changed

+16
-11
lines changed

.github/workflows/test-suite.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ jobs:
389389
conda-remove-defaults: true
390390
- name: Install doc dependencies
391391
run: |
392-
conda install --file environment_docs.yml
392+
conda env update -n ephoto --file environment_docs.yml
393393
- name: Build docs
394394
if: matrix.os != 'windows-latest'
395395
run: |

cmake/YggdrasilTools.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,8 @@ function(compile_yggdrasil)
302302
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
303303
set(flags)
304304
if(ARGS_LANGUAGE)
305-
list(APPEND flags ${ARGS_LANGUAGE})
305+
string(TOLOWER "${ARGS_LANGUAGE}" YGG_LANGUAGE)
306+
list(APPEND flags ${YGG_LANGUAGE})
306307
endif()
307308
if(ARGS_WITH_ASAN)
308309
list(APPEND flags --with-asan)

recipe/bld_cpp.bat

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,20 @@ mkdir conda_build
55
cd conda_build
66

77
:: Call cmake
8-
cmake -GNinja ^
9-
-D CMAKE_BUILD_TYPE=%CONFIGURATION% ^
10-
-D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
11-
-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON ^
8+
rem -GNinja ^
9+
rem -D CMAKE_BUILD_TYPE=%CONFIGURATION% ^
10+
rem -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
11+
cmake -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON ^
1212
-D WITH_YGGDRASIL:BOOL=ON ..
1313
if errorlevel 1 exit 1
1414

15-
:: Using ninja
16-
ninja all
17-
ninja install
15+
# Build all, run tests, then install
16+
cmake --build . --config %CONFIGURATION%
17+
cmake --install .
18+
19+
rem :: Using ninja
20+
rem ninja all
21+
rem ninja install
1822

1923
:: Run tests
2024
if errorlevel 1 exit 1

recipe/build_cpp.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ set -euo pipefail
44
# Using cmake
55
mkdir conda_build
66
cd conda_build
7+
# -D CMAKE_BUILD_TYPE=Release \
8+
# -D CMAKE_INSTALL_PREFIX=$PREFIX \
79
cmake ${CMAKE_ARGS} \
8-
-D CMAKE_BUILD_TYPE=Release \
9-
-D CMAKE_INSTALL_PREFIX=$PREFIX \
1010
-D CMAKE_VERBOSE_MAKEFILE:BOOL=ON \
1111
-D WITH_YGGDRASIL:BOOL=ON ..
1212

0 commit comments

Comments
 (0)