Fix merge conflicts.

rgayatri23 · Sep 16, 2024 · 95b5e99 · 95b5e99
2 parents 2c01134 + 1d28438
commit 95b5e99
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cmake/kokkos_arch.cmake b/cmake/kokkos_arch.cmake
@@ -803,12 +803,12 @@ IF(KOKKOS_ARCH_INTEL_PVC)
 ENDIF()
 
 IF (KOKKOS_ENABLE_OPENMP)
-    IF(KOKKOS_CLANG_IS_CRAY)
-      COMPILER_SPECIFIC_LINK_OPTIONS(
-          CrayClang -fopenmp # Needed for cmake>=3.28
-          Clang -fopenmp
-      )
-    ENDIF()
+  IF(KOKKOS_CLANG_IS_CRAY)
+    COMPILER_SPECIFIC_LINK_OPTIONS(
+        CrayClang -fopenmp # Needed for cmake>=3.28
+        Clang -fopenmp
+    )
+  ENDIF()
 ENDIF()
 
 IF (KOKKOS_ENABLE_OPENMPTARGET)