Skip to content

Commit f92ef12

Browse files
committed
Merge pull request #12 from raullaasner/cmakelists-fix
Prevent CMAKE_Fortran_COMPILER_VERSION from becoming undefined
2 parents acc9833 + 0af5cbb commit f92ef12

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ else()
4040
)
4141
endif()
4242

43-
if (CMAKE_VERSION VERSION_GREATER 3.2.3)
43+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
4444
# Detect Fortran compiler version directly
45-
if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
45+
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
4646
set(opencoarrays_aware_compiler true)
4747
add_definitions(-DPREFIX_NAME=_gfortran_caf_)
4848
else()
@@ -51,7 +51,7 @@ if (CMAKE_VERSION VERSION_GREATER 3.2.3)
5151
endif()
5252
else()
5353
# Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
54-
if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 5.0.0))
54+
if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
5555
set(opencoarrays_aware_compiler true)
5656
add_definitions(-DPREFIX_NAME=_gfortran_caf_)
5757
else()

src/mpi/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,16 @@ elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
88
set(cray_compiler true)
99
endif()
1010

11-
if (CMAKE_VERSION VERSION_GREATER 3.2.3)
11+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
1212
# Detect Fortran compiler version directly
13-
if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 5.0.0))
13+
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
1414
set(opencoarrays_aware_compiler true)
1515
else()
1616
set(opencoarrays_aware_compiler false)
1717
endif()
1818
else()
1919
# Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
20-
if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 5.0.0))
20+
if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
2121
set(opencoarrays_aware_compiler true)
2222
else()
2323
set(opencoarrays_aware_compiler false)

src/tests/unit/extensions/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
22
set(gfortran_compiler true)
33
endif()
44

5-
if (CMAKE_VERSION VERSION_GREATER 3.2.3)
5+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
66
# Detect Fortran compiler version directly
7-
if(gfortran_compiler AND (CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER 4.9.2))
7+
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
88
set(opencoarrays_aware_compiler true)
99
else()
1010
set(opencoarrays_aware_compiler false)
1111
endif()
1212
else()
1313
# Use the C compiler version as a proxy for the Fortran compiler version (won't work with NAG)
14-
if(gfortran_compiler AND (CMAKE_C_COMPILER_VERSION VERSION_GREATER 4.9.2))
14+
if(gfortran_compiler AND (NOT CMAKE_C_COMPILER_VERSION VERSION_LESS 5))
1515
set(opencoarrays_aware_compiler true)
1616
else()
1717
set(opencoarrays_aware_compiler false)

0 commit comments

Comments
 (0)