Skip to content

Commit cf9a152

Browse files
committed
Change to Release config for external executable build on windows
Change to using Ninja for external executable build on windows Increase the verbosity of the builds on windows Update requirements and run exports
1 parent fcdb2e1 commit cf9a152

File tree

3 files changed

+20
-4
lines changed

3 files changed

+20
-4
lines changed

.github/workflows/conda_recipe.yml

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,24 @@ jobs:
6767
- name: Check output from ePhoto executable install by conda
6868
run: |
6969
python scripts/devtasks.py compare-files output_conda.data --driver 4
70-
- name: Build example against the installed library using CMake
70+
- name: Build example against the installed library using CMake/Make (Unix)
71+
if: matrix.os != 'windows-latest'
7172
run: |
7273
conda list
7374
cd tests/external
7475
mkdir build
7576
cd build
7677
cmake .. -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
7778
cmake --build .
79+
- name: Build example against the installed library using CMake/Ninja (Windows)
80+
if: matrix.os == 'windows-latest'
81+
run: |
82+
conda list
83+
cd tests/external
84+
mkdir build
85+
cd build
86+
cmake -GNinja -D CMAKE_BUILD_TYPE=Release -D CMAKE_VERBOSE_MAKEFILE:BOOL=ON ..
87+
cmake --build .
7888
- name: Test built example executable (Unix)
7989
if: matrix.os != 'windows-latest'
8090
run: |
@@ -84,7 +94,7 @@ jobs:
8494
if: matrix.os == 'windows-latest'
8595
run: |
8696
cd tests
87-
./external/build/Debug/example
97+
./external/build/Release/example
8898
- name: Check built example executable output
8999
run: |
90100
python scripts/devtasks.py compare-files tests/example_output.data --driver 4

recipe/bld.bat

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ cd conda_build
77
:: Call cmake
88
cmake -GNinja ^
99
-D CMAKE_BUILD_TYPE=%CONFIGURATION% ^
10-
-D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ..
10+
-D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
11+
-D CMAKE_VERBOSE_MAKEFILE=ON ..
1112
if errorlevel 1 exit 1
1213

1314
:: Using ninja

recipe/meta.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,25 @@ source:
1212

1313
build:
1414
number: 0
15+
run_exports:
16+
- {{ pin_subpackage('ephotosynthesis', max_pin='x.x') }}
1517

1618
requirements:
1719
build:
1820
- cmake
1921
- make # [unix]
2022
- ninja # [win]
23+
- {{ compiler('c') }}
24+
- {{ stdlib('c') }}
2125
- {{ compiler('cxx') }}
2226
host:
2327
- libboost-devel >=1.36.0
2428
- sundials >=5.7.0
2529
run:
26-
- libboost-devel >=1.36.0
2730
- sundials >=5.7.0
2831

32+
# TODO: Add Python wrapper as export?
33+
2934
test:
3035
commands:
3136
- test -f $PREFIX/lib/libEPhotosynthesis$SHLIB_EXT # [unix]

0 commit comments

Comments
 (0)