checkpoint changes for merge

AIEADA · Oct 23, 2024 · aabbafa · aabbafa
1 parent 8f91462
commit aabbafa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CMake/BuildERFExe.cmake b/CMake/BuildERFExe.cmake
@@ -68,9 +68,9 @@ function(build_erf_lib erf_lib_name)
   endif()
 
   if(ERF_ENABLE_NOAH)
-    target_include_directories(${erf_lib_name} PUBLIC 
-                               ${SRC_DIR}/LandSurfaceModel/NOAH 
-                               ${CMAKE_SOURCE_DIR}/Submodules/NOAH-MP/drivers/hrldas)
+    target_include_directories(${erf_lib_name} PUBLIC
+                               $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Source/LandSurfaceModel/NOAH>
+                               $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/Submodules/NOAH-MP/drivers/hrldas>)
     target_sources(${erf_lib_name} PRIVATE
                    ${SRC_DIR}/LandSurfaceModel/NOAH/NOAH.cpp)
     target_compile_definitions(${erf_lib_name} PUBLIC ERF_USE_NOAH)

diff --git a/Source/LandSurfaceModel/NOAH/NOAH.H b/Source/LandSurfaceModel/NOAH/NOAH.H
@@ -9,10 +9,10 @@
 #include <AMReX_Geometry.H>
 #include <AMReX_MultiFabUtil.H>
 
-#include <NullSurf.H>
+#include <ERF_NullSurf.H>
 #include <ERF_Constants.H>
-#include <IndexDefines.H>
-#include <DataStruct.H>
+#include <ERF_IndexDefines.H>
+#include <ERF_DataStruct.H>
 
 // External include from the noahmp library
 #include <NoahmpIO.H>