Skip to content

Commit

Permalink
Merge pull request #728 from ICB-DCM/develop
Browse files Browse the repository at this point in the history
Release v0.10.8
  • Loading branch information
dweindl authored Jul 24, 2019
2 parents 6e5aaa6 + 0ce296e commit e11eed5
Show file tree
Hide file tree
Showing 80 changed files with 10,709 additions and 6,575 deletions.
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ matrix:
- hdf5
- swig
- gcc
update: true
before_install:
- travis_wait brew link --overwrite gcc # fix linker warning regarding /usr/local/include/c++
- export -f travis_fold travis_nanoseconds travis_time_start travis_time_finish
Expand All @@ -76,6 +77,7 @@ matrix:
- doxygen
- ragel
- graphviz
update: true
before_install:
- export PATH=/Users/travis/Library/Python/3.7/bin:/Library/TeX/texbin:$PATH
- export -f travis_fold travis_nanoseconds travis_time_start travis_time_finish
Expand Down Expand Up @@ -113,7 +115,7 @@ script:
- if [[ "$CI_MODE" == "test" ]]; then $FOLD notebooks "cd $BASE_DIR && scripts/runNotebook.sh python/examples/example_*/"; fi
- if [[ "$TRAVIS_OS_NAME" != "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD cpputest ./scripts/run-cpputest.sh; fi
- if [[ "$TRAVIS_OS_NAME" != "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD python-tests ./scripts/run-python-tests.sh; fi
- if [[ "$TRAVIS_OS_NAME" != "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD python-tests ./tests/testCMakeCompilation.sh; fi
- if [[ "$TRAVIS_OS_NAME" != "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD cmake ./tests/testCMakeCompilation.sh; fi
- if [[ "$CI_MODE" == "deploy" ]]; then $FOLD doxygen ./scripts/run-doxygen.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD cppcheck ./scripts/run-cppcheck.sh; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$CI_MODE" == "test" ]]; then $FOLD valgrind ./scripts/run-valgrind.sh; fi
Expand Down
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ set(AMICI_SRC_LIST
${CMAKE_SOURCE_DIR}/src/misc.cpp
${CMAKE_SOURCE_DIR}/src/rdata.cpp
${CMAKE_SOURCE_DIR}/src/edata.cpp
${CMAKE_SOURCE_DIR}/src/exception.cpp
${CMAKE_SOURCE_DIR}/src/hdf5.cpp
${CMAKE_SOURCE_DIR}/src/spline.cpp
${CMAKE_SOURCE_DIR}/src/solver.cpp
Expand All @@ -123,6 +124,7 @@ set(AMICI_SRC_LIST
${CMAKE_SOURCE_DIR}/src/sundials_matrix_wrapper.cpp
${CMAKE_SOURCE_DIR}/src/sundials_linsol_wrapper.cpp
${CMAKE_SOURCE_DIR}/src/abstract_model.cpp
${CMAKE_SOURCE_DIR}/src/vector.cpp
)

add_library(${PROJECT_NAME} ${AMICI_SRC_LIST})
Expand Down
Loading

0 comments on commit e11eed5

Please sign in to comment.