From 380e5475dcdd2435d3b956959f2c575a830676dd Mon Sep 17 00:00:00 2001 From: Sam Reeve <6740307+streeve@users.noreply.github.com> Date: Thu, 28 Sep 2023 17:24:13 -0400 Subject: [PATCH] Require Cabana 0.6 (requires Kokkos >= 3.7) --- .github/workflows/CI.yml | 2 +- CMakeLists.txt | 5 +---- src/CMakeLists.txt | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 19d048f..d429b77 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7240e4f..af257ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2f4a82d..0f8ed72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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})