diff options
| author | Brad King <brad.king@kitware.com> | 2024-03-20 13:55:35 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2024-03-20 13:55:48 (GMT) |
| commit | d704a3f8189ce737ab5dd38ab3c87a0eebb7a7b6 (patch) | |
| tree | c72572e8fef94e46c7fb912ef7d88fc2b4636340 /Tests/FortranModules | |
| parent | 94edef24714325eb25d7ba3a4f1479673c1bfbff (diff) | |
| parent | 36dc8d6d50e0724d6f4bcebdada5610db8dbd698 (diff) | |
| download | CMake-d704a3f8189ce737ab5dd38ab3c87a0eebb7a7b6.zip CMake-d704a3f8189ce737ab5dd38ab3c87a0eebb7a7b6.tar.gz CMake-d704a3f8189ce737ab5dd38ab3c87a0eebb7a7b6.tar.bz2 | |
Merge topic 'ninja-fortran-include'
36dc8d6d50 Ninja: Fix Fortran module deps in files INCLUDEd by preprocessed sources
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !9351
Diffstat (limited to 'Tests/FortranModules')
| -rw-r--r-- | Tests/FortranModules/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/FortranModules/non_pp_include.f90 | 7 | ||||
| -rw-r--r-- | Tests/FortranModules/test_non_pp_include_main.f90 | 8 | ||||
| -rw-r--r-- | Tests/FortranModules/test_non_pp_include_module.f90 | 6 |
4 files changed, 15 insertions, 8 deletions
diff --git a/Tests/FortranModules/CMakeLists.txt b/Tests/FortranModules/CMakeLists.txt index 1e5ff89..61d06d9 100644 --- a/Tests/FortranModules/CMakeLists.txt +++ b/Tests/FortranModules/CMakeLists.txt @@ -67,7 +67,7 @@ add_definitions(-DFOO -DBAR=1) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) add_executable(test_preprocess test_preprocess.F90 test_preprocess_module.F90) -add_executable(test_non_pp_include test_non_pp_include_main.f90) +add_executable(test_non_pp_include test_non_pp_include_main.f90 test_non_pp_include_module.f90) # Build the external project separately using a custom target. # Make sure it uses the same build configuration as this test. diff --git a/Tests/FortranModules/non_pp_include.f90 b/Tests/FortranModules/non_pp_include.f90 index 7eb1725..5c28abc 100644 --- a/Tests/FortranModules/non_pp_include.f90 +++ b/Tests/FortranModules/non_pp_include.f90 @@ -1,3 +1,4 @@ -SUBROUTINE NON_PP_INCLUDE_SUBROUTINE - PRINT *, "Hello World!" -END SUBROUTINE NON_PP_INCLUDE_SUBROUTINE +subroutine non_pp_include_subroutine + use non_pp_include_module + call non_pp_include_module_subroutine +end subroutine diff --git a/Tests/FortranModules/test_non_pp_include_main.f90 b/Tests/FortranModules/test_non_pp_include_main.f90 index 8a04fbd..7236cc9 100644 --- a/Tests/FortranModules/test_non_pp_include_main.f90 +++ b/Tests/FortranModules/test_non_pp_include_main.f90 @@ -1,5 +1,5 @@ -INCLUDE "non_pp_include.f90" +include "non_pp_include.f90" -PROGRAM MAINF90 - CALL NON_PP_INCLUDE_SUBROUTINE -END PROGRAM MAINF90 +program test_non_pp_include_main + call non_pp_include_subroutine +end program diff --git a/Tests/FortranModules/test_non_pp_include_module.f90 b/Tests/FortranModules/test_non_pp_include_module.f90 new file mode 100644 index 0000000..764b7ca --- /dev/null +++ b/Tests/FortranModules/test_non_pp_include_module.f90 @@ -0,0 +1,6 @@ +module non_pp_include_module +contains + subroutine non_pp_include_module_subroutine + print *, "Hello World!" + end subroutine +end module |