Fix object dependencies of build artifacts.

Author: vehre

src/tests/integration/pde_solvers/coarrayBurgers/CMakeLists.txt

@@ -19,13 +19,25 @@ else()
 endif()
 
 set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf")
-add_executable(coarray_burgers_pde
-  main.F90
-  global_field.F90
-  local_field.F90
+add_library(cbp_base STATIC
+  ${config_directory}/compiler_capabilities.txt
   ${library_directory}/ForTrilinos_assertion_utility.F90
   ${library_directory}/object_interface.F90
   ${library_directory}/co_object_interface.F90
 )
-add_dependencies(coarray_burgers_pde caf_mpi_static)
-target_include_directories(coarray_burgers_pde PRIVATE ${config_directory})
+add_library(cbp_local STATIC
+  ${config_directory}/compiler_capabilities.txt
+  local_field.F90
+)
+add_executable(coarray_burgers_pde
+  ${config_directory}/compiler_capabilities.txt
+  global_field.F90
+  main.F90
+)
+target_link_libraries(cbp_local PUBLIC cbp_base caf_mpi_static)
+target_link_libraries(coarray_burgers_pde PRIVATE cbp_local)
+set_target_properties(cbp_base cbp_local coarray_burgers_pde
+  PROPERTIES
+  Fortran_MODULE_DIRECTORY "${config_directory}"
+  INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR};${config_directory}"
+)

src/tests/integration/pde_solvers/coarrayHeatSimplified/CMakeLists.txt

@@ -1,11 +1,13 @@
 set(CMAKE_Fortran_COMPILER "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR}/caf")
-add_library(local_field OBJECT local_field.f90)
-add_library(global_field OBJECT global_field.f90)
-add_dependencies(local_field caf_mpi_static)
-add_dependencies(global_field local_field caf_mpi_static)
+add_library(local_field STATIC local_field.f90)
+add_library(global_field STATIC global_field.f90)
 add_executable(co_heat
   main.f90
-  $<TARGET_OBJECTS:local_field>
-  $<TARGET_OBJECTS:global_field>
 )
-add_dependencies(co_heat caf_mpi_static)
+target_link_libraries(global_field PUBLIC local_field caf_mpi_static)
+target_link_libraries(co_heat PRIVATE global_field)
+set_target_properties(local_field global_field co_heat
+  PROPERTIES
+  INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}"
+  Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}"
+)

src/tests/utilities/CMakeLists.txt

@@ -31,27 +31,21 @@ if ("${CMAKE_Fortran_COMPILER_ID}" MATCHES "GNU" )
   set(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS})
 endif()
 
-add_library( oc_test_interfaces OBJECT
+add_library( oc_test_interfaces STATIC
   opencoarrays_object_interface.f90
   oc_assertions_interface.F90
   )
 add_library( opencoarrays_test_utilities STATIC
-  oc_assertions_implementation.F90
   $<TARGET_OBJECTS:oc_test_interfaces>
+  oc_assertions_implementation.F90
   )
-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
+target_link_libraries(opencoarrays_test_utilities PUBLIC oc_test_interfaces)
+set_target_properties(oc_test_interfaces opencoarrays_test_utilities
   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")
+  Fortran_MODULE_DIRECTORY "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}"
+  INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}/${mod_dir_tail}"
+  COMPILE_OPTIONS "-fcoarray=lib"
+  )
 
 if(HAVE_ERROR_STOP_IN_PURE)
   target_compile_definitions(oc_test_interfaces