Skip to content

Commit

Permalink
Sync from upstream.
Browse files Browse the repository at this point in the history
  • Loading branch information
grafikrobot committed Jul 12, 2024
2 parents a385733 + 48ff7b9 commit 2f4606c
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 20 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ env:
B2_LINK: shared,static
LCOV_BRANCH_COVERAGE: 0
CODECOV_NAME: Github Actions
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
posix:
Expand Down
13 changes: 13 additions & 0 deletions .github/workflows/codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ env:
B2_LINK: shared,static
LCOV_BRANCH_COVERAGE: 0
CODECOV_NAME: Github Actions
ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true

jobs:
posix:
Expand Down Expand Up @@ -184,3 +185,15 @@ jobs:
- name: Upload coverage
if: matrix.coverage
run: ci/codecov.sh "upload"
env:
BOOST_CI_CODECOV_IO_UPLOAD: skip

- name: Upload coverage
if: matrix.coverage
uses: codecov/codecov-action@v4
with:
disable_search: true
file: coverage.info
name: Github Actions
token: ${{secrets.CODECOV_TOKEN}}
verbose: true
74 changes: 54 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,60 @@ add_library(Boost::numeric_odeint ALIAS boost_numeric_odeint)

target_include_directories(boost_numeric_odeint INTERFACE include)

target_link_libraries(boost_numeric_odeint
INTERFACE
Boost::assert
Boost::compute
Boost::config
Boost::core
Boost::fusion
Boost::iterator
Boost::math
Boost::mpi
Boost::mpl
Boost::multi_array
Boost::numeric_ublas
Boost::preprocessor
Boost::range
Boost::throw_exception
Boost::type_traits
Boost::units
Boost::utility
)
if(BOOST_NUMERIC_ODEINT_NO_ADAPTORS)

target_link_libraries(boost_numeric_odeint
INTERFACE
Boost::assert
Boost::config
Boost::core
Boost::fusion
Boost::iterator
Boost::math
Boost::mpl
Boost::multi_array
Boost::numeric_ublas
Boost::preprocessor
Boost::range
Boost::static_assert
Boost::throw_exception
Boost::type_traits
Boost::units
Boost::utility
)

else()

target_link_libraries(boost_numeric_odeint
INTERFACE
Boost::assert
Boost::compute
Boost::config
Boost::core
Boost::fusion
Boost::iterator
Boost::math
Boost::mpl
Boost::multi_array
Boost::numeric_ublas
Boost::preprocessor
Boost::range
Boost::static_assert
Boost::throw_exception
Boost::type_traits
Boost::units
Boost::utility
)

# From CMake 3.30 linking against MPI when it does not exist gives errors
if(BOOST_ENABLE_MPI)
target_link_libraries(boost_numeric_odeint
INTERFACE
Boost::mpi
)
endif()

endif()

if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")

Expand Down

0 comments on commit 2f4606c

Please sign in to comment.