Fix CMake build for new tests and code on 422

Author: zbeekman

CMakeLists.txt

@@ -651,7 +651,6 @@ if(opencoarrays_aware_compiler)
     add_caf_test(comp_allocated_1 2 comp_allocated_1)
     add_caf_test(comp_allocated_2 2 comp_allocated_2)
     add_caf_test(alloc_comp_get_convert_nums 2 alloc_comp_get_convert_nums)
-    add_caf_test(alloc_comp_send_convert_nums 2 alloc_comp_send_convert_nums)
   endif()
 
 
@@ -668,9 +667,11 @@ if(opencoarrays_aware_compiler)
     endif()
     if((NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
       add_caf_test(send_convert_char_array 2 send_convert_char_array)
+      add_caf_test(alloc_comp_send_convert_nums 2 alloc_comp_send_convert_nums)
     else()#if((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
       message( AUTHOR_WARNING "Skipping the following tests to GFortran < 7.3.0 lack of compatibility:
-        send_convert_char_array.f90")
+        send_convert_char_array.f90
+        alloc_comp_send_convert_nums.f90")
     endif()
   endif()
 

src/tests/unit/send-get/CMakeLists.txt

@@ -14,27 +14,24 @@ caf_compile_executable(get_with_vector_index get_with_vector_index.f90)
 
 ## Pure send() tests
 caf_compile_executable(send_array send_array_test.f90)
+if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+  caf_compile_executable(send_convert_nums send_convert_nums.f90)
+endif()
 caf_compile_executable(send_with_vector_index send_with_vector_index.f90)
 
 # Pure sendget() tests
 caf_compile_executable(sendget_convert_char_array sendget_convert_char_array.f90)
+if(NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)
+  caf_compile_executable(sendget_convert_nums sendget_convert_nums.f90)
+endif()
 caf_compile_executable(send_convert_char_array send_convert_char_array.f90)
 #caf_compile_executable(sendget_with_vector_index sendget_with_vector_index.f90)
 caf_compile_executable(strided_sendget strided_sendget.f90)
 set_target_properties(build_strided_sendget
   PROPERTIES MIN_IMAGES 3)
 
-if (gfortran_compiler AND (NOT CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.3.0))
-  caf_compile_executable(sendget_convert_nums sendget_convert_nums.f90)
-  caf_compile_executable(send_convert_nums send_convert_nums.f90)
+# Allocatable components w/ convert
+if((NOT (CMAKE_Fortran_COMPILER_VERSION VERSION_LESS 7.0.0)) OR (CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
   caf_compile_executable(alloc_comp_get_convert_nums alloc_comp_get_convert_nums.f90)
   caf_compile_executable(alloc_comp_send_convert_nums alloc_comp_send_convert_nums.f90)
-elseif((CAF_RUN_DEVELOPER_TESTS OR $ENV{OPENCOARRAYS_DEVELOPER}))
-  message( AUTHOR_WARNING
-    "Skipping building the following tests due to GFortran < 7.3.0 lack of compatibility:
-    sendget_convert_nums.f90
-    send_convert_nums.f90"
-  )
-
 endif()
-