Remove CXXOMPFLAGS from arch files

cp2k · Jul 12, 2019 · e968d0d · e968d0d
1 parent 82bf4f3
commit e968d0d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/arch/CRAY-XC30-gfortran-cuda.psmp b/arch/CRAY-XC30-gfortran-cuda.psmp
@@ -12,8 +12,7 @@ AR       = ar -r
 GPUVER   = K20X
 
 CPPFLAGS =
-CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
-CXXOMPFLAGS = -fopenmp
+CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11 -fopenmp
 DFLAGS   = -D__FFTW3 -D__parallel -D__SCALAPACK -D__HAS_smm_dnn -D__ACC -D__DBCSR_ACC
 CFLAGS   = $(DFLAGS)
 FCFLAGS  = $(DFLAGS) -O3 -fopenmp -mavx -funroll-loops -ftree-vectorize \

diff --git a/arch/CRAY-XK7-gfortran-cuda.psmp b/arch/CRAY-XK7-gfortran-cuda.psmp
@@ -13,8 +13,7 @@ HWTOPO   = yes
 GPUVER   = K20X
 
 CPPFLAGS =
-CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
-CXXOMPFLAGS = -fopenmp
+CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11 -fopenmp
 DFLAGS   = -D__GEMINI -D__FFTW3 -D__parallel -D__SCALAPACK -D__HAS_smm_dnn -D__ACC -D__DBCSR_ACC
 CFLAGS   = $(DFLAGS)
 FCFLAGS  = $(DFLAGS) -O3 -fopenmp -march=bdver1 -funroll-loops -ftree-vectorize \

diff --git a/arch/Linux-x86-64-gfortran.warn b/arch/Linux-x86-64-gfortran.warn
@@ -8,8 +8,7 @@ AR       = ar -r
 GPUVER   = K20X
 
 CPPFLAGS =
-CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11
-CXXOMPFLAGS = -fopenmp
+CXXFLAGS = -O3 -I${CUDA_PATH}/include -std=c++11 -fopenmp
 
 #https://gcc.gnu.org/onlinedocs/gfortran/Error-and-Warning-Options.html