diff --git a/kokkos-testing/fd_catalog/CMakeLists.txt b/kokkos-testing/fd_catalog/CMakeLists.txt
index 7da2e0c917a01df983aeeff76ffe1c2db32a680f..f1af9fdc9f938a54535c74b28c5571faaa1cd6af 100644
--- a/kokkos-testing/fd_catalog/CMakeLists.txt
+++ b/kokkos-testing/fd_catalog/CMakeLists.txt
@@ -12,6 +12,18 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 set(LINK_LIBS ${LINK_LIBS} Threads::Threads)
 
+
+######################################################################
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(COMPILER_IS_CLANG TRUE)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    set(COMPILER_IS_GNU TRUE)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
+    set(COMPILER_IS_INTEL)
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "PGI")
+    set(COMPILER_IS_PGI)
+endif ()
+
 find_package(SILO)
 if (SILO_FOUND)
     add_definitions(-DHAVE_SILO)
@@ -130,8 +142,13 @@ if (ENABLE_OPENMP)
 endif()
 
 set(CMAKE_CXX_FLAGS_DEBUG "-g")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -march=native -g -DNDEBUG")
-set(CMAKE_CXX_FLAGS_RELEASEASSERT "-O3 -march=native -g -fpermissive")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -g -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASEASSERT "-O3 -g -fpermissive")
+
+if (COMPILER_IS_CLANG OR COMPILER_IS_GNU OR COMPILER_IS_INTEL)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native")
+endif()
+ 
 
 macro(setup_fd_catalog_target FD_TGT_NAME SINGLE_PRECISION)
     set(FD_SOURCES "fd_main.cpp")