fix path to windows dll

conda-forge · Feb 14, 2025 · 015d915 · 015d915
1 parent 6998b48
commit 015d915
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 15 deletions.
diff --git a/recipes/khiops/bld.bat b/recipes/khiops/bld.bat
@@ -14,12 +14,16 @@ copy build\conda\bin\MODL_Coclustering.exe %PREFIX%\bin
 copy build\conda\bin\_khiopsgetprocnumber.exe %PREFIX%\bin
 
 REM Copy the KhiopsNativeInterface libs for the kni package
-copy build\conda\bin\KhiopsNativeInterface.dll %PREFIX%\bin
-copy build\conda\lib\KhiopsNativeInterface.lib %PREFIX%\lib
+copy build\conda\bin\KhiopsNativeInterface.dll %LIBRARY_BIN%
+copy build\conda\lib\KhiopsNativeInterface.lib %LIBRARY_LIB%
 
 REM Copy the scripts to the Conda PREFIX path
 copy build\conda\tmp\khiops_env.cmd %PREFIX%\bin
 copy packaging\windows\khiops_coclustering.cmd %PREFIX%\bin
 copy packaging\windows\khiops.cmd %PREFIX%\bin
 
+REM Copy the header file
+copy src\Learning\KhiopsNativeInterface\KhiopsNativeInterface.h %LIBRARY_INC%
+
+
 if errorlevel 1 exit 1
diff --git a/recipes/khiops/build.sh b/recipes/khiops/build.sh
@@ -18,3 +18,6 @@ mv ./build/conda/lib/libKhiopsNativeInterface* "$PREFIX/lib"
 cp ./build/conda/tmp/khiops_env "$PREFIX/bin"
 cp ./packaging/linux/common/khiops "$PREFIX/bin"
 cp ./packaging/linux/common/khiops_coclustering "$PREFIX/bin"
+
+# Copy header file
+cp ./src/Learning/KhiopsNativeInterface/KhiopsNativeInterface.h "$PREFIX/include"
diff --git a/recipes/khiops/conda_build_config.yaml b/recipes/khiops/conda_build_config.yaml
@@ -1,3 +1,4 @@
+
 ---
 # Note on MPI version pinning:
 # We pin the MPI versions so the build does not suddently stop working
@@ -25,12 +26,3 @@ cxx_compiler:
 cxx_compiler_version:
   - 12  # [linux]
   - 16  # [osx]
-#c_stdlib:
-#  - sysroot                    # [linux]
-#  - macosx_deployment_target   # [osx]
-#  - vs                         # [win]
-#c_stdlib_version:              # [unix]
-#  - 2.12                       # [linux and x86_64]
-#  - 2.17                       # [linux and not x86_64]
-#  - 10.13                      # [osx and x86_64]
-#  - 11.0                       # [osx and arm64]
diff --git a/recipes/khiops/meta.yaml b/recipes/khiops/meta.yaml
@@ -56,8 +56,10 @@ outputs:
     files:
       - lib/libKhiopsNativeInterface.so*                  # [linux]
       - lib/libKhiopsNativeInterface.{{ version }}.dylib  # [osx]
-      - bin/KhiopsNativeInterface.dll                     # [win]
-      - lib/KhiopsNativeInterface.lib                     # [win]
+      - include/KhiopsNativeInterface.h                   # [linux or osx]
+      - %LIBRARY_BIN%/KhiopsNativeInterface.dll           # [win]
+      - %LIBRARY_LIB%/KhiopsNativeInterface.lib           # [win]
+      - %LIBRARY_INC%/KhiopsNativeInterface.h             # [win]
     requirements:
       build:
         - cmake
@@ -68,8 +70,8 @@ outputs:
       commands:
         - test -f $PREFIX/lib/libKhiopsNativeInterface.so                   # [linux]
         - test -f $PREFIX/lib/libKhiopsNativeInterface.{{ version }}.dylib  # [osx]
-        - if not exist %PREFIX%\\lib\\libKhiopsNativeInterface.lib exit 1   # [win]
-        - if not exist %PREFIX%\\bin\\libKhiopsNativeInterface.dll exit 1   # [win]
+        - if not exist %LIBRARY_LIB%\KhiopsNativeInterface.lib exit 1      # [win]
+        - if not exist %LIBRARY_BIN%\KhiopsNativeInterface.dll exit 1      # [win]
 
 about:
   home: https://khiops.org