diff --git a/cmake/install/post/adios2-config-dummy/CMakeLists.txt b/cmake/install/post/adios2-config-dummy/CMakeLists.txt
index b2ea4c9b55..9e4332343f 100644
--- a/cmake/install/post/adios2-config-dummy/CMakeLists.txt
+++ b/cmake/install/post/adios2-config-dummy/CMakeLists.txt
@@ -25,9 +25,8 @@ if(ADIOS2_HAVE_Fortran)
   target_compile_definitions(with_Fortran PRIVATE WITH_ADIOS2)
   target_link_libraries(with_Fortran adios2::adios2_f)
 
-  set_target_properties(without_Fortran with_Fortran
-    PROPERTIES
-      LINKER_LANGUAGE Fortran
+  set_target_properties(without_Fortran with_Fortran PROPERTIES
+    LINKER_LANGUAGE Fortran
   )
 endif()
 
diff --git a/examples/hello/bpFWriteCRead/CMakeLists.txt b/examples/hello/bpFWriteCRead/CMakeLists.txt
index f06f36ec76..03c7cbf07c 100644
--- a/examples/hello/bpFWriteCRead/CMakeLists.txt
+++ b/examples/hello/bpFWriteCRead/CMakeLists.txt
@@ -12,11 +12,11 @@ if(ADIOS2_HAVE_MPI)
   
   if(ADIOS2_HAVE_Fortran)
     add_executable(FWriter FWriter.f90)
-    target_link_libraries(FWriter adios2_f MPI::MPI_Fortran)
-    set_property(TARGET FWriter PROPERTY LINKER_LANGUAGE Fortran)
-    
     add_executable(FReader FReader.f90)
+    target_link_libraries(FWriter adios2_f MPI::MPI_Fortran)
     target_link_libraries(FReader adios2_f MPI::MPI_Fortran)
-    set_property(TARGET FReader PROPERTY LINKER_LANGUAGE Fortran)
+    set_target_properties(FWriter FReader PROPERTIES
+      LINKER_LANGUAGE Fortran
+    )
   endif()
 endif()
diff --git a/examples/hello/bpReader/CMakeLists.txt b/examples/hello/bpReader/CMakeLists.txt
index 083368f381..90146d7b4f 100644
--- a/examples/hello/bpReader/CMakeLists.txt
+++ b/examples/hello/bpReader/CMakeLists.txt
@@ -16,8 +16,8 @@ if(ADIOS2_HAVE_MPI)
   if(ADIOS2_HAVE_Fortran)
     add_executable(hello_bpReaderHeatMap3D_f helloBPReaderHeatMap3D.f90)
     target_link_libraries(hello_bpReaderHeatMap3D_f adios2_f MPI::MPI_Fortran)
-    set_property(TARGET hello_bpReaderHeatMap3D_f
-      PROPERTY LINKER_LANGUAGE Fortran
+    set_target_properties(hello_bpReaderHeatMap3D_f PROPERTIES
+      LINKER_LANGUAGE Fortran
     )
   endif()
   
diff --git a/examples/hello/bpWriter/CMakeLists.txt b/examples/hello/bpWriter/CMakeLists.txt
index 4d8ddd6ab9..8307a29f8f 100644
--- a/examples/hello/bpWriter/CMakeLists.txt
+++ b/examples/hello/bpWriter/CMakeLists.txt
@@ -23,7 +23,9 @@ endif()
 if(ADIOS2_HAVE_Fortran)
   add_executable(hello_bpWriter_f helloBPWriter.F90)
   target_link_libraries(hello_bpWriter_f adios2_f)
-  set_property(TARGET hello_bpWriter_f PROPERTY LINKER_LANGUAGE Fortran)
+  set_target_properties(hello_bpWriter_f PROPERTIES
+    LINKER_LANGUAGE Fortran
+  )
 endif()
 
 if(ADIOS2_HAVE_MPI)
diff --git a/testing/adios2/bindings/fortran/CMakeLists.txt b/testing/adios2/bindings/fortran/CMakeLists.txt
index 17d7d24c6c..3902154272 100644
--- a/testing/adios2/bindings/fortran/CMakeLists.txt
+++ b/testing/adios2/bindings/fortran/CMakeLists.txt
@@ -7,6 +7,7 @@ macro(fortran_add_test_helper testname mpi)
   set(pfx Bindings.Fortran.)
   set(tgt Test.${pfx}${testname})
   add_executable(${tgt} Test${testname}.F90)
+  set_target_properties(${tgt} PROPERTIES LINKER_LANGUAGE Fortran)
   target_link_libraries(${tgt} adios2_f)
   if(mpi)
     target_compile_definitions(${tgt} PRIVATE USE_MPI)
diff --git a/testing/adios2/engine/staging-common/CMakeLists.txt b/testing/adios2/engine/staging-common/CMakeLists.txt
index afef26e031..668dd48f72 100644
--- a/testing/adios2/engine/staging-common/CMakeLists.txt
+++ b/testing/adios2/engine/staging-common/CMakeLists.txt
@@ -56,9 +56,17 @@ add_executable(TestCommonServer TestCommonServer.cpp)
 add_executable(TestCommonClient TestCommonClient.cpp)
 if(ADIOS2_HAVE_Fortran)
   add_library(TestCommonData_f OBJECT TestData_mod.F90)
-
-  add_executable(TestCommonWrite_f TestCommonWriteF.F90 $<TARGET_OBJECTS:TestCommonData_f>)
-  add_executable(TestCommonRead_f TestCommonReadF.F90 $<TARGET_OBJECTS:TestCommonData_f>)
+  add_executable(TestCommonWrite_f
+    TestCommonWriteF.F90
+    $<TARGET_OBJECTS:TestCommonData_f>
+  )
+  add_executable(TestCommonRead_f
+    TestCommonReadF.F90
+    $<TARGET_OBJECTS:TestCommonData_f>
+  )
+  set_target_properties(TestCommonWrite_f TestCommonRead_f PROPERTIES
+    LINKER_LANGUAGE Fortran
+  )
   target_link_libraries(TestCommonWrite_f adios2_f)
   target_link_libraries(TestCommonRead_f adios2_f)
 endif()