Use modern properties of targets

 - Also pass compiler flags for coarrays for utility library

Author: zbeekman

CMakeLists.txt

@@ -525,8 +525,10 @@ function(caf_compile_executable target main_depend)
       COMMAND "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf"
                  ${includes} ${localDefs} ${config_Fortran_flags}
                  -o "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${target}"
-                 "${CMAKE_CURRENT_SOURCE_DIR}/${main_depend}" ${ARGN}
-      DEPENDS "${main_depend}" ${ARGN} caf_mpi_static
+                 "${CMAKE_CURRENT_SOURCE_DIR}/${main_depend}"
+		 "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopencoarrays_test_utilities.a"
+		 ${ARGN}
+      DEPENDS "${main_depend}" ${ARGN} caf_mpi_static opencoarrays_test_utilities
       VERBATIM
       )
   add_custom_target("build_${target}" ALL

src/tests/unit/teams/CMakeLists.txt

@@ -1,4 +1,3 @@
 caf_compile_executable(team_number team-number.f90)
 caf_compile_executable(teams_subset teams_subset.f90)
-target_link_libraries(teams_subset opencoarrays_test_utilities)
 caf_compile_executable(get_communicator get-communicator.f90)

src/tests/utilities/CMakeLists.txt

@@ -15,9 +15,6 @@ check_fortran_source_compiles("
   HAVE_ERROR_STOP_IN_PURE
   SRC_EXT ".f90"
   )
-if(HAVE_ERROR_STOP_IN_PURE)
-  add_definitions(-DHAVE_ERROR_STOP_IN_PURE)
-endif()
 
 # Check support for Fortran 2018 variable stop code
 check_fortran_source_compiles("
@@ -29,14 +26,46 @@ check_fortran_source_compiles("
 "
   HAVE_VARIABLE_STOP_CODE
   SRC_EXT ".f90")
-if(HAVE_VARIABLE_STOP_CODE)
-  add_definitions(-DHAVE_VARIABLE_STOP_CODE)
-endif()
 
 if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
   set(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS})
 endif()
 
+add_library( oc_test_interfaces OBJECT
+  object_interface.f90
+  assertions_interface.F90
+  )
+add_library( opencoarrays_test_utilities
+  assertions_implementation.F90
+  $<TARGET_OBJECTS:oc_test_interfaces>
+  )
+set_target_properties(opencoarrays_test_utilities
+  PROPERTIES
+  Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+set_target_properties(oc_test_interfaces
+  PROPERTIES
+  Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}")
+
+target_compile_options(oc_test_interfaces
+  PUBLIC
+  "-fcoarray=lib")
+target_compile_options(opencoarrays_test_utilities
+  PUBLIC
+  "-fcoarray=lib")
+
+if(HAVE_ERROR_STOP_IN_PURE)
+  target_compile_definitions(oc_test_interfaces
+    PUBLIC -DHAVE_ERROR_STOP_IN_PURE)
+  target_compile_definitions(opencoarrays_test_utilities
+    PUBLIC -DHAVE_ERROR_STOP_IN_PURE)
+endif()
+if(HAVE_VARIABLE_STOP_CODE)
+  target_compile_definitions(oc_test_interfaces
+    PUBLIC -DHAVE_VARIABLE_STOP_CODE)
+  target_compile_definitions(opencoarrays_test_utilities
+    PUBLIC -DHAVE_VARIABLE_STOP_CODE)
+endif()
+
 #Toggle C preprocessor macro for turning assertions on or off
 if(NO_ASSERTIONS)
   target_compile_definitions( opencoarrays_test_utilities
@@ -47,9 +76,3 @@ else()
     PUBLIC "-DUSE_ASSERTIONS=.true."
   )
 endif()
-
-add_library( opencoarrays_test_utilities
-  object_interface.f90
-  assertions_interface.F90
-  assertions_implementation.F90
-)