From 2876baafd07d31c3a3ab30cc38b087ebcfc07eab Mon Sep 17 00:00:00 2001 From: James Barnett Date: Tue, 3 Oct 2017 13:08:56 -0400 Subject: [PATCH] Use -restrict whenever Intel is used, no matter the package --- cmake/CMakeLists.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 9a74a788d0..ca71c41ddb 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -37,6 +37,10 @@ enable_language(CXX) ##################################################################### include(CheckCCompilerFlag) +if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict") +endif() + ######################################################################## # User input options # ######################################################################## @@ -150,11 +154,6 @@ if(ENABLE_USER-OMP OR ENABLE_KOKKOS OR ENABLE_USER-INTEL) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}") endif() -if((ENABLE_USER-OMP OR ENABLE_OPT OR ENABLE_USER-INTEL) AND - (${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -restrict") -endif() - if(ENABLE_KSPACE) set(FFT "KISSFFT" CACHE STRING "FFT library for KSPACE package") set_property(CACHE FFT PROPERTY STRINGS KISSFFT FFTW3 MKL FFTW2)