Merge branch 'master' into fix-704-cmake-mpi-compile-flags

Author: Damian Rouson

CMakeLists.txt

@@ -543,17 +543,17 @@ function(caf_compile_executable target main_depend)
   foreach(d ${DirDefs})
     list(APPEND localDefs "-D${d}")
   endforeach()
-    add_custom_command(OUTPUT "${target}"
-      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}"
-		 "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopencoarrays_test_utilities.a"
-		 "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/libopencoarrays_mod.a"
-		 ${ARGN}
-      DEPENDS "${main_depend}" ${ARGN} caf_mpi_static opencoarrays_test_utilities opencoarrays_mod
-      VERBATIM
-      )
+  add_custom_command(OUTPUT "${target}"
+    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}"
+            $<TARGET_FILE:opencoarrays_test_utilities>
+            $<TARGET_FILE:opencoarrays_mod>
+            ${ARGN}
+    DEPENDS "${main_depend}" ${ARGN} caf_mpi_static opencoarrays_test_utilities opencoarrays_mod
+    VERBATIM
+    )
   add_custom_target("build_${target}" ALL
     DEPENDS "${target}")
 endfunction(caf_compile_executable)

src/mpi/CMakeLists.txt

@@ -314,7 +314,7 @@ configure_file("${CMAKE_SOURCE_DIR}/src/extensions/caf.in" "${CMAKE_BINARY_DIR}/
   @ONLY)
 
 
-# List of carrun.in variables needing configuration:
+# List of cafrun.in variables needing configuration:
 #
 # @CAF_VERSION@ @MPIEXEC@ @MPIEXEC_NUMPROC_FLAG@ @MPIEXEC_PREFLAGS@ @MPIEXEC_POSTFLAGS@
 # @HAVE_FAILED_IMG@

src/tests/utilities/CMakeLists.txt

@@ -35,7 +35,7 @@ add_library( oc_test_interfaces OBJECT
   opencoarrays_object_interface.f90
   oc_assertions_interface.F90
   )
-add_library( opencoarrays_test_utilities
+add_library( opencoarrays_test_utilities STATIC
   oc_assertions_implementation.F90
   $<TARGET_OBJECTS:oc_test_interfaces>
   )