Skip to content

Commit

Permalink
Merge pull request #14 from streeve/fixup_core
Browse files Browse the repository at this point in the history
Require Cabana 0.6
  • Loading branch information
adrianpope committed Oct 5, 2023
2 parents bc9b5ba + 380e547 commit 41e71bd
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
uses: actions/checkout@v2.2.0
with:
repository: ECP-copa/Cabana
ref: master
ref: 0.6.0
path: Cabana
- name: Build Cabana
working-directory: Cabana
Expand Down
5 changes: 1 addition & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ project(HACCabana LANGUAGES CXX C)

include(GNUInstallDirs)

find_package(Cabana REQUIRED)
if(Kokkos_VERSION_MAJOR LESS 4 AND Kokkos_VERSION_MINOR LESS 7)
message( FATAL_ERROR "HACCabana requires Kokkos >= 3.7" )
endif()
find_package(Cabana REQUIRED VERSION 0.6.0)

add_subdirectory(src)
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ install(TARGETS HACCabana
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})

target_link_libraries(HACCabana Cabana::cabanacore)
target_link_libraries(HACCabana Cabana::Core)

install(TARGETS HACCabana DESTINATION ${CMAKE_INSTALL_LIBDIR})

Expand Down

0 comments on commit 41e71bd

Please sign in to comment.