File tree Expand file tree Collapse file tree 4 files changed +16
-11
lines changed
Expand file tree Collapse file tree 4 files changed +16
-11
lines changed Original file line number Diff line number Diff 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 : |
Original file line number Diff line number Diff 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)
Original file line number Diff line number Diff line change @@ -5,16 +5,20 @@ mkdir conda_build
55cd 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 ..
1313if 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
2024if errorlevel 1 exit 1
Original file line number Diff line number Diff line change @@ -4,9 +4,9 @@ set -euo pipefail
44# Using cmake
55mkdir conda_build
66cd conda_build
7+ # -D CMAKE_BUILD_TYPE=Release \
8+ # -D CMAKE_INSTALL_PREFIX=$PREFIX \
79cmake ${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
You can’t perform that action at this time.
0 commit comments