diff --git a/CMakeLists.txt b/CMakeLists.txt
index 82f8bd1261983b739a1a28fcbd1aea6c4ecda933..c7737156595d2fdf3fdd1e964f2da778334cfd60 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,11 @@ else()
   set (KOKKOS_ENABLE_DEBUG ON)
 endif()
 
-set(CMAKE_CXX_STANDARD "17")
+
+# Pastis default compiler flags
+set(PASTIS_CXX_FLAGS "-Wall")
+
+#set(CMAKE_CXX_STANDARD "17")
 
 add_subdirectory(${PASTIS_SOURCE_DIR}/packages/kokkos)
 include_directories(${Kokkos_INCLUDE_DIRS_RET})
@@ -39,9 +43,6 @@ if(NOT CMAKE_BUILD_TYPE)
       FORCE)
 endif(NOT CMAKE_BUILD_TYPE)
 
-# Pastis default compiler flags
-set(PASTIS_CXX_FLAGS "-Wall")
-
 # Kokkso compiler flags
 include(GetKokkosCompilerFlags)