Skip to content

Commit 0af5cbb

Browse files
committed
It's better to remove the temporary fix and just require CMake to be at least 3.3.1.
1 parent 49e2475 commit 0af5cbb

File tree

3 files changed

+3
-10
lines changed

3 files changed

+3
-10
lines changed

CMakeLists.txt

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ cmake_minimum_required(VERSION 3.0)
33
#Name project and specify source languages
44
project(opencoarrays VERSION 2.0.0 LANGUAGES C Fortran)
55

6-
# Temporary fix
7-
if (CMAKE_VERSION VERSION_EQUAL 3.3.0)
8-
set(CMAKE_Fortran_COMPILER_VERSION ${CMAKE_Fortran_COMPILER_VERSION}
9-
CACHE STRING "")
10-
mark_as_advanced(FORCE CMAKE_Fortran_COMPILER_VERSION)
11-
endif()
12-
136
#Print an error message on an attempt to build inside the source directory tree:
147
if ("${CMAKE_CURRENT_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_BINARY_DIR}")
158
message(FATAL_ERROR "ERROR! "
@@ -47,7 +40,7 @@ else()
4740
)
4841
endif()
4942

50-
if (NOT CMAKE_VERSION VERSION_LESS 3.3)
43+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
5144
# Detect Fortran compiler version directly
5245
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
5346
set(opencoarrays_aware_compiler true)

src/mpi/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ elseif("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "Cray")
88
set(cray_compiler true)
99
endif()
1010

11-
if (NOT CMAKE_VERSION VERSION_LESS 3.3)
11+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
1212
# Detect Fortran compiler version directly
1313
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
1414
set(opencoarrays_aware_compiler true)

src/tests/unit/extensions/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ if("${CMAKE_Fortran_COMPILER_ID}" STREQUAL "GNU")
22
set(gfortran_compiler true)
33
endif()
44

5-
if (NOT CMAKE_VERSION VERSION_LESS 3.3)
5+
if (NOT CMAKE_VERSION VERSION_LESS 3.3.1)
66
# Detect Fortran compiler version directly
77
if(gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 5))
88
set(opencoarrays_aware_compiler true)

0 commit comments

Comments
 (0)