From 797d750a6e44ec0561538d91ce43d6bc1c35aea4 Mon Sep 17 00:00:00 2001 From: Alexander Soklev Date: Thu, 19 Dec 2024 22:35:49 +0200 Subject: [PATCH] Set windows to search for .a files as well --- recipes/rte-rrtmgp/bld.bat | 2 +- recipes/rte-rrtmgp/meta.yaml | 32 +++++++++++--------------------- 2 files changed, 12 insertions(+), 22 deletions(-) diff --git a/recipes/rte-rrtmgp/bld.bat b/recipes/rte-rrtmgp/bld.bat index 40fd7dd9c7606..58ec93c1f90a9 100644 --- a/recipes/rte-rrtmgp/bld.bat +++ b/recipes/rte-rrtmgp/bld.bat @@ -39,5 +39,5 @@ cmake --build . -- -j%NUMBER_OF_PROCESSORS% ctest --output-on-failure --test-dir . -V :: Manually copy libraries, binaries, and Fortran module files to %PREFIX% -xcopy /s /y build\*.lib %PREFIX%\lib\ +xcopy /s /y build\*.a %PREFIX%\lib\ xcopy /s /y build\*.mod %PREFIX%\include\ diff --git a/recipes/rte-rrtmgp/meta.yaml b/recipes/rte-rrtmgp/meta.yaml index 83642d1912d00..a5ae9af18c0bb 100644 --- a/recipes/rte-rrtmgp/meta.yaml +++ b/recipes/rte-rrtmgp/meta.yaml @@ -9,7 +9,7 @@ package: source: # TODO: Set `makepath-cmake` to {{ version }} when we have real version url: https://github.com/makepath-alex/rte-rrtmgp/archive/refs/heads/conda-recipe-dev.zip - sha256: f896d4e2c23bace17b49a669b85d132fd10052d8b82d83c16779af398698f82a + sha256: 2407de8bdf483946dcf294ee270b90ee4b02591991b8a08c7d818c5a4c5b9bdb build: number: 0 @@ -49,30 +49,20 @@ requirements: test: commands: # Check if the files exists - # Unix - - test -f $PREFIX/lib/librrtmgp.a # [unix] - - test -f $PREFIX/lib/librrtmgpkernels.a # [unix] - - test -f $PREFIX/lib/librte.a # [unix] - - test -f $PREFIX/lib/librtekernels.a # [unix] - # Win - - test -f $PREFIX/lib/librrtmgp.lib # [win] - - test -f $PREFIX/lib/librrtmgpkernels.lib # [win] - - test -f $PREFIX/lib/librte.lib # [win] - - test -f $PREFIX/lib/librtekernels.lib # [win] + # Unix & Win (we build with mingw, so it generates .a files) + - test -f $PREFIX/lib/librrtmgp.a + - test -f $PREFIX/lib/librrtmgpkernels.a + - test -f $PREFIX/lib/librte.a + - test -f $PREFIX/lib/librtekernels.a outputs: - name: rte_rrtmgp files: - # Unix - - lib/librrtmgp.a # [unix] - - lib/librrtmgpkernels.a # [unix] - - lib/librte.a # [unix] - - lib/librtekernels.a # [unix] - # Win - - lib/librrtmgp.lib # [win] - - lib/librrtmgpkernels.lib # [win] - - lib/librte.lib # [win] - - lib/librtekernels.lib # [win] + # Unix & Win + - lib/librrtmgp.a + - lib/librrtmgpkernels.a + - lib/librte.a + - lib/librtekernels.a about: home: https://github.com/earth-system-radiation/rte-rrtmgp