fixup: add Grid Targets to main Cabana_Targets

ECP-copa · Sep 21, 2023 · 7a0d777 · 7a0d777
1 parent c9280d1
commit 7a0d777
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/cmake/CabanaConfig.cmakein b/cmake/CabanaConfig.cmakein
@@ -26,7 +26,6 @@ set(Cabana_ENABLE_CAJITA @Cabana_ENABLE_CAJITA@) # FIXME: remove in next release
 include("${CMAKE_CURRENT_LIST_DIR}/Cabana_Targets.cmake")
 add_library(Cabana::Core ALIAS Cabana::cabanacore) # FIXME: remove in next release
 if(Cabana_ENABLE_GRID)
-  include("${CMAKE_CURRENT_LIST_DIR}/CabanaGrid_Targets.cmake")
   add_library(Cabana::Grid ALIAS Cabana::Cajita) # FIXME: remove in next release
 endif()
 set(Cabana_ENABLE_HYPRE @Cabana_ENABLE_HYPRE@)

diff --git a/grid/src/CMakeLists.txt b/grid/src/CMakeLists.txt
@@ -106,15 +106,10 @@ target_include_directories(Cajita
   $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)
 
 install(TARGETS Cajita
-  EXPORT GridTargets
+  EXPORT Cabana_Targets
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-install(EXPORT GridTargets
-  FILE CabanaGrid_Targets.cmake
-  NAMESPACE Cabana::
-  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Cabana)
-
 install(FILES ${HEADERS_PUBLIC}
   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})