Skip to content

Commit 2cb7998

Browse files
authored
Building with multiple boost versions (#112)
1 parent f5ec431 commit 2cb7998

File tree

4 files changed

+16
-10
lines changed

4 files changed

+16
-10
lines changed

.github/workflows/siemens_to_ismrmrd_conda.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,7 @@ jobs:
3333
ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
3434
working-directory: conda
3535
run: |
36-
./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p `find build_pkg -name siemens_to_ismrmrd*.tar.bz2`
36+
for p in $(find build_pkg -name siemens_to_ismrmrd*.tar.bz2)
37+
do
38+
./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p "$p"
39+
done

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ message(STATUS "Looking for packages in : ${CMAKE_PREFIX_PATH}")
1818
#VERSIONING
1919
set(SIEMENS_TO_ISMRMRD_VERSION_MAJOR 1)
2020
set(SIEMENS_TO_ISMRMRD_VERSION_MINOR 2)
21-
set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 7)
21+
set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 8)
2222
set(SIEMENS_TO_ISMRMRD_VERSION_STRING ${SIEMENS_TO_ISMRMRD_VERSION_MAJOR}.${SIEMENS_TO_ISMRMRD_VERSION_MINOR}.${SIEMENS_TO_ISMRMRD_VERSION_PATCH})
2323

2424
# Generate the converter_version.h header file

conda/conda_build_config.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
boost:
2+
- 1.76.0
3+
- 1.80.0

conda/meta.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@ source:
1111

1212
requirements:
1313
build:
14-
- boost=1.76.0
14+
- boost {{ boost }}
1515
- clang>=13.0.1 # [osx]
1616
- clangxx>=13.0.1 # [osx]
1717
- cmake>=3.20.0
1818
- gcc_linux-64>=9.0.0 # [linux64]
1919
- gxx_linux-64>=9.0.0 # [linux64]
20-
- ismrmrd=1.12.0
21-
- libxml2=2.9.12
22-
- libxslt=1.1.33
20+
- ismrmrd=1.13.1
21+
- libxml2=2.9
22+
- libxslt=1.1
2323
- ninja=1.10.*
2424

2525
run:
26-
- ismrmrd=1.12.0
27-
- boost=1.76.0
28-
- libxml2=2.9.12
29-
- libxslt=1.1.33
26+
- ismrmrd=1.13.1
27+
- boost {{ boost }}
28+
- libxml2=2.9
29+
- libxslt=1.1
3030

3131
about:
3232
home: https://github.com/ismrmrd/siemens_to_ismrmrd

0 commit comments

Comments
 (0)