fixed conflicts

fnalacceleratormodeling · Jun 25, 2024 · f75c7ac · f75c7ac
2 parents 57b048b + d0787a6
commit f75c7ac
Show file tree

Hide file tree

Showing 3 changed files with 634 additions and 33 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -216,11 +216,11 @@ else()
         ON
         CACHE BOOL "enable CUDA LAMBDA feature" FORCE)
     message(STATUS "Using vendored copy of kokkos with CUDA")
-    set(Kokkos_ENABLE_LIBDL
-        OFF
-        CACHE BOOL "Turn usage of LIBDL off in Kokkos" FORCE)
-    message(STATUS "Disabled the use of LIBDL in Kokkos")
-    endif()
+  endif()
+  set(Kokkos_ENABLE_LIBDL
+    OFF
+    CACHE BOOL "Turn usage of LIBDL off in Kokkos" FORCE)
+  message(STATUS "Disabled the use of LIBDL in Kokkos")
   add_subdirectory(src/synergia/utils/kokkos)
   include_directories(${Kokkos_INCLUDE_DIRS_RET})
   set(kokkos_libs kokkos)