Building with multiple boost versions (#112)

ismrmrd · Dec 10, 2022 · 2cb7998 · 2cb7998
1 parent f5ec431
commit 2cb7998
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/.github/workflows/siemens_to_ismrmrd_conda.yml b/.github/workflows/siemens_to_ismrmrd_conda.yml
@@ -33,4 +33,7 @@ jobs:
           ANACONDA_TOKEN: ${{ secrets.ANACONDA_TOKEN }}
         working-directory: conda
         run: |
-          ./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p `find build_pkg -name siemens_to_ismrmrd*.tar.bz2`
+          for p in $(find build_pkg -name siemens_to_ismrmrd*.tar.bz2)
+          do
+            ./publish_package.sh -u ismrmrd -t "$ANACONDA_TOKEN" -p "$p"
+          done
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ message(STATUS "Looking for packages in : ${CMAKE_PREFIX_PATH}")
 #VERSIONING
 set(SIEMENS_TO_ISMRMRD_VERSION_MAJOR 1)
 set(SIEMENS_TO_ISMRMRD_VERSION_MINOR 2)
-set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 7)
+set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 8)
 set(SIEMENS_TO_ISMRMRD_VERSION_STRING ${SIEMENS_TO_ISMRMRD_VERSION_MAJOR}.${SIEMENS_TO_ISMRMRD_VERSION_MINOR}.${SIEMENS_TO_ISMRMRD_VERSION_PATCH})
 
 # Generate the converter_version.h header file

diff --git a/conda/conda_build_config.yaml b/conda/conda_build_config.yaml
@@ -0,0 +1,3 @@
+boost:
+    - 1.76.0
+    - 1.80.0
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -11,22 +11,22 @@ source:
 
 requirements:
   build:
-    - boost=1.76.0
+    - boost {{ boost }}
     - clang>=13.0.1        # [osx]
     - clangxx>=13.0.1      # [osx]
     - cmake>=3.20.0
     - gcc_linux-64>=9.0.0  # [linux64] 
     - gxx_linux-64>=9.0.0  # [linux64]
-    - ismrmrd=1.12.0
-    - libxml2=2.9.12
-    - libxslt=1.1.33 
+    - ismrmrd=1.13.1
+    - libxml2=2.9
+    - libxslt=1.1 
     - ninja=1.10.*
 
   run:
-    - ismrmrd=1.12.0
-    - boost=1.76.0
-    - libxml2=2.9.12
-    - libxslt=1.1.33 
+    - ismrmrd=1.13.1
+    - boost {{ boost }}
+    - libxml2=2.9
+    - libxslt=1.1 
 
 about:
   home: https://github.com/ismrmrd/siemens_to_ismrmrd
-Original file line number
+Diff line change
@@ -0,0 +1,3 @@
+    boost:
+        - 1.76.0
+        - 1.80.0