Skip to content

Commit 7b093d1

Browse files
committed
Rectify w/ master: CMake version checks and C test
1 parent 57f3519 commit 7b093d1

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/tests/unit/extensions/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ endif()
44

55
if (CMAKE_VERSION VERSION_GREATER 3.2.3)
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)

src/tests/unit/simple/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ target_link_libraries(atomics OpenCoarrays)
1313

1414
# C tests
1515
#include(CMakeForceCompiler)
16-
#CMAKE_FORCE_C_COMPILER($ENV{CC} GNU)
17-
add_executable(C_sync_images syncimages2.c ../../../mpi/mpi_caf.c ../../../common/caf_auxiliary.c)
16+
#CMAKE_FORCE_C_COMPILER(mpicc GNU)
17+
#add_executable(C_sync_images syncimages2.c ../../../mpi/mpi_caf.c ../../../common/caf_auxiliary.c)

0 commit comments

Comments
 (0)