AnotherFoxGuy/autocmake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #242 from bast/radovan/omp-module-refactor

Browse Source 
rm redundant line
This commit is contained in:
Radovan Bast 2018-04-10 15:06:44 +02:00 committed by GitHub
commit fe28e29c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/omp.cmake
View File

@ -42,6 +42,7 @@ if(ENABLE_OPENMP)
endif() endif()
endif() endif()
# this is only needed for CMake below 3.5
if(DEFINED CMAKE_Fortran_COMPILER_ID AND NOT DEFINED OpenMP_Fortran_FLAGS) 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 # we do this in a pedestrian way because the Fortran support is relatively recent
if(CMAKE_Fortran_COMPILER_ID MATCHES GNU) if(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
@ -50,8 +51,7 @@ if(ENABLE_OPENMP)
if(CMAKE_Fortran_COMPILER_ID MATCHES Intel) if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
if(WIN32) if(WIN32)
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Qopenmp") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Qopenmp")
elseif(CMAKE_Fortran_COMPILER_ID STREQUAL "Intel" AND elseif("${CMAKE_Fortran_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528")
"${CMAKE_Fortran_COMPILER_VERSION}" VERSION_LESS "15.0.0.20140528")
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -openmp") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -openmp")
else() else()
set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qopenmp") set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qopenmp")