From 704e3e3f0d63dddd72d31382ce491c9e68bc9df9 Mon Sep 17 00:00:00 2001 From: Brian Dobbins Date: Wed, 15 Apr 2026 15:03:21 -0600 Subject: [PATCH 1/2] Added a CMake option to force CESM to always build yaml-cpp, vs using FindPackage. This addresses a build issue when Conda environments are active and find it in their search path. --- cime_config/buildlib | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cime_config/buildlib b/cime_config/buildlib index aaea0dbb9e..f52632865b 100755 --- a/cime_config/buildlib +++ b/cime_config/buildlib @@ -218,6 +218,7 @@ def _build_tuvx(caseroot, libroot, bldroot): cmake_args += "-DCMAKE_Fortran_COMPILER_WORKS=1 " cmake_args += "-DCMAKE_C_COMPILER_WORKS=1 " cmake_args += "-DCMAKE_CXX_COMPILER_WORKS=1 " + cmake_args += "-DCMAKE_DISABLE_FIND_PACKAGE_yaml-cpp=1 " if (case.get_value("MACH") == "izumi") : cmake_args += f"-DCMAKE_PREFIX_PATH={arg_dict['NETCDF_PATH']} " cmake_args += f"-DCMAKE_IGNORE_PATH={os.environ.get('PYTHONHOME')} " @@ -241,8 +242,9 @@ def _build_tuvx(caseroot, libroot, bldroot): incldir = os.environ.get('USER_INCLDIR') if incldir is None: incldir = '' - os.environ['USER_INCLDIR'] = incldir + \ - f" -I{_tuvx_include_dir(libroot)} " + #os.environ['USER_INCLDIR'] = incldir + \ + # f" -I{_tuvx_include_dir(libroot)} " + os.environ['USER_INCLDIR'] = f" -I{_tuvx_include_dir(libroot)} " + incldir # create symlink to library in folder CIME expects libraries to be in dst = os.path.join(libroot, "libtuvx.a") From 420a7f880eb964a27ac996474ec6005a31299161 Mon Sep 17 00:00:00 2001 From: Brian Dobbins Date: Wed, 15 Apr 2026 15:19:44 -0600 Subject: [PATCH 2/2] Remove earlier path override idea --- cime_config/buildlib | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cime_config/buildlib b/cime_config/buildlib index f52632865b..c006921b37 100755 --- a/cime_config/buildlib +++ b/cime_config/buildlib @@ -242,9 +242,8 @@ def _build_tuvx(caseroot, libroot, bldroot): incldir = os.environ.get('USER_INCLDIR') if incldir is None: incldir = '' - #os.environ['USER_INCLDIR'] = incldir + \ - # f" -I{_tuvx_include_dir(libroot)} " - os.environ['USER_INCLDIR'] = f" -I{_tuvx_include_dir(libroot)} " + incldir + os.environ['USER_INCLDIR'] = incldir + \ + f" -I{_tuvx_include_dir(libroot)} " # create symlink to library in folder CIME expects libraries to be in dst = os.path.join(libroot, "libtuvx.a")