diff options
| author | Brad King <brad.king@kitware.com> | 2016-02-05 13:55:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-02-05 14:26:44 (GMT) |
| commit | c5eb21b6d1f4187778ad49545761a818e1126541 (patch) | |
| tree | 1ee13587cb37984b90e9bd4cbcab178a2c0ed5b8 /Tests/Fortran/Subdir | |
| parent | a5a5a6857241c21d306661d723b749839f4c6e1a (diff) | |
| download | CMake-c5eb21b6d1f4187778ad49545761a818e1126541.zip CMake-c5eb21b6d1f4187778ad49545761a818e1126541.tar.gz CMake-c5eb21b6d1f4187778ad49545761a818e1126541.tar.bz2 | |
Fix dependency scanning configuration in subdirectories
Refactoring in commit v3.5.0-rc1~347^2~2 (Set the current dirs on the
snapshot before creating the cmMakefile) accidentally changed the
source and binary directories configured in `cmake -E cmake_depends`
for use during dependency scanning. This can cause the wrong directory
information to be loaded. It also breaks Fortran module dependency
scanning for modules provided by targets in subdirectories that do
not have Fortran_MODULE_DIRECTORY set.
Fix the dependency scanning directory configuration and add a test to
cover the Fortran module case in which the breakage was observed.
Reported-by: Kelly Thompson <kgt@lanl.gov>
Diffstat (limited to 'Tests/Fortran/Subdir')
| -rw-r--r-- | Tests/Fortran/Subdir/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Tests/Fortran/Subdir/subdir.f90 | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/Tests/Fortran/Subdir/CMakeLists.txt b/Tests/Fortran/Subdir/CMakeLists.txt new file mode 100644 index 0000000..52683e5 --- /dev/null +++ b/Tests/Fortran/Subdir/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(subdir_mods2 subdir.f90) +target_include_directories(subdir_mods2 INTERFACE ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/Tests/Fortran/Subdir/subdir.f90 b/Tests/Fortran/Subdir/subdir.f90 new file mode 100644 index 0000000..68955f6 --- /dev/null +++ b/Tests/Fortran/Subdir/subdir.f90 @@ -0,0 +1,2 @@ +MODULE subdirModuleA +END MODULE |