Commit 198c0a1
committed
Merge branch 'atmosphere/cmake_framework' into develop (PR #1366)
This merge fixes a CMake build failure by adding src/framework to the list of
include file search paths.
With merge commit 55c737f (PR #1359), the file mpas_halo_interface.inc from the
src/framework directory was included by several files in the atmosphere core via
preprocessing directives. While the Makefile files under src/core_atmosphere
already contained the framework directory in the list of search paths for
include files, the CMakeLists.txt files did not, resulting in a build failure
when compiling the atmosphere core with CMake.
To address the build error, the CMakeLists.txt file for src/framework now
exports its source directory as an interface include directory, adding that
directory to the compilation include path for any target that links against
framework.
* atmosphere/cmake_framework:
Add src/framework to list of include directories when building with CMake1 file changed
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
69 | 69 | | |
70 | 70 | | |
71 | 71 | | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
72 | 75 | | |
73 | 76 | | |
74 | 77 | | |
| |||
0 commit comments