Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump ISMRMRD dependency to v1.14.2 #139

Merged
merged 1 commit into from
Nov 25, 2024
Merged

Bump ISMRMRD dependency to v1.14.2 #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 12)
set(SIEMENS_TO_ISMRMRD_VERSION_PATCH 13)
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
Expand Down Expand Up @@ -67,7 +67,7 @@ set(Boost_USE_STATIC_RUNTIME OFF)


find_package(Boost COMPONENTS system thread program_options filesystem timer REQUIRED)
find_package(ISMRMRD 1.14.1 REQUIRED)
find_package(ISMRMRD 1.14.2 REQUIRED)
find_package(HDF5 REQUIRED COMPONENTS C)

include_directories( ${ISMRMRD_INCLUDE_DIR} ${HDF5_C_INCLUDE_DIR} )
Expand Down
10 changes: 5 additions & 5 deletions conda/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,18 @@ requirements:
- clang>=13.0.1 # [osx]
- clangxx>=13.0.1 # [osx]
- cmake>=3.20.0
- gcc_linux-64>=9.0.0 # [linux64]
- gcc_linux-64>=9.0.0 # [linux64]
- gxx_linux-64>=9.0.0 # [linux64]
- ismrmrd=1.14.1
- ismrmrd>=1.14.2
- libxml2>=2.9
- libxslt=1.1
- libxslt=1.1
- ninja=1.12.*

run:
- ismrmrd=1.14.1
- ismrmrd>=1.14.2
- boost {{ boost }}
- libxml2>=2.9
- libxslt=1.1
- libxslt=1.1

about:
home: https://github.com/ismrmrd/siemens_to_ismrmrd
Expand Down
2 changes: 1 addition & 1 deletion dependencies/ismrmrd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4037c41fcdcb8870234baaeb46ce4848aac1579a
802b52d69dcc31935888d3c69cc2a179f13a5608
Loading