From 1926b3774b80133093b220f72c9cefafb4f671e8 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Wed, 4 Apr 2018 19:49:55 +0200 Subject: [PATCH 1/2] rm redundant line --- modules/omp.cmake | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/modules/omp.cmake b/modules/omp.cmake index 1c85040..db65494 100644 --- a/modules/omp.cmake +++ b/modules/omp.cmake @@ -50,8 +50,7 @@ if(ENABLE_OPENMP) if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) if(WIN32) set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Qopenmp") - elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" AND - "${CMAKE_Fortran_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528") + elseif("${CMAKE_Fortran_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -openmp") else() set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qopenmp") From 3d031770d4beae0cd74fa4ef83c9c89b04bf7df5 Mon Sep 17 00:00:00 2001 From: Radovan Bast Date: Wed, 4 Apr 2018 19:51:50 +0200 Subject: [PATCH 2/2] added comment --- modules/omp.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/modules/omp.cmake b/modules/omp.cmake index db65494..f63d8de 100644 --- a/modules/omp.cmake +++ b/modules/omp.cmake @@ -42,6 +42,7 @@ if(ENABLE_OPENMP) endif() endif() + # this is only needed for CMake below 3.5 if(DEFINED CMAKE_Fortran_COMPILER_ID AND NOT DEFINED OpenMP_Fortran_FLAGS) # we do this in a pedestrian way because the Fortran support is relatively recent if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)