fix heatf pkg-config file and bmic, bmicxx pkg-config names

csdms · Mar 11, 2024 · a16ef56 · a16ef56
1 parent c795a9d
commit a16ef56
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/babelizer/data/{{cookiecutter.package_name}}/meson.build b/babelizer/data/{{cookiecutter.package_name}}/meson.build
@@ -13,10 +13,10 @@ project(
 
 {%- if cookiecutter.language == 'c' %}
 lang = 'c'
-bmilib = 'bmiheatc'
+bmilib = 'BmiHeatC'
 {%- elif cookiecutter.language == 'c++' %}
 lang = 'cpp'
-bmilib = 'bmiheatcxx'
+bmilib = 'BmiHeatCXX'
 {%- elif cookiecutter.language == 'fortran' %}
 lang = 'fortran'
 bmilib = 'bmiheatf'

diff --git a/noxfile.py b/noxfile.py
@@ -59,10 +59,10 @@ def test_langs(session: nox.session, lang) -> None:
         print(bmiheatf_pc, file=fp)
 
     heatf_pc = f"""\
-_prefix={os.environ.get('CMAKE_PREFIX_PATH', instdir)}
-exec_prefix=${{_prefix}}
+prefix={instdir!s}
+exec_prefix=${{prefix}}
 libdir=${{exec_prefix}}/lib
-includedir=${{_prefix}}/include
+includedir=${{prefix}}/include
 
 Name: heatf
 Description: Heat Fortran
@@ -86,6 +86,7 @@ def test_langs(session: nox.session, lang) -> None:
             session.debug(f"{k}: {v!r}")
 
         with session.chdir(package):
+            session.run("pkg-config", "--list-all")
             session.run("python", "-m", "pip", "install", ".[dev]")
 
     with session.chdir(testdir):