reorder

conda-forge · Jul 7, 2023 · 8b5f994 · 8b5f994
1 parent dd4ef4a
commit 8b5f994
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 11 deletions.
diff --git a/recipes/salome-med/bld.bat b/recipes/salome-med/bld.bat
@@ -20,6 +20,24 @@ if errorlevel 1 exit 1
 cmake --build . --target install --config Release
 if errorlevel 1 exit 1
 
-xcopy /y /s /f /e %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med %SP_DIR%\med
-xcopy /y /s /f %LIBRARY_PREFIX%\lib\*.dll %LIBRARY_PREFIX%\bin
-xcopy /y /s /f %LIBRARY_PREFIX%\lib\*.dll %SP_DIR%\med
+echo "SP_DIR=%SP_DIR%"
+mkdir %SP_DIR%
+
+
+rem xcopy /y /s /f /e %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med %SP_DIR%\med
+echo %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med
+dir /p %LIBRARY_PREFIX%
+dir /p %LIBRARY_PREFIX%\lib
+dir /p %LIBRARY_PREFIX%\lib\python%PY_VER%
+dir /p %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages
+dir /p %PREFIX%\Lib
+dir /p %PREFIX%\Lib\site-packages
+
+mkdir %PREFIX%\Lib\site-packages\med
+dir /p %PREFIX%\Lib\site-packages\med
+xcopy /y /s /f %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med\* %PREFIX%\Lib\site-packages\med
+
+rem xcopy /y /s /f /e "%LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med" %SP_DIR%\med\
+rem  move %LIBRARY_PREFIX%\lib\python%PY_VER%\site-packages\med %PREFIX%\Lib\site-packages\med
+rem  xcopy /y /s /f %LIBRARY_PREFIX%\lib\*.dll %LIBRARY_PREFIX%\bin
+xcopy /y /s /f %LIBRARY_PREFIX%\lib\*.dll %PREFIX%\Lib\site-packages\med
diff --git a/recipes/salome-medcoupling/macos_dynamic_lookup.patch b/recipes/salome-medcoupling/macos_dynamic_lookup.patch
@@ -1,7 +1,16 @@
 diff --git a/src/MEDCoupling_Swig/CMakeLists.txt b/src/MEDCoupling_Swig/CMakeLists.txt
-index f73ce98a..c810a0d9 100644
+index f73ce98a..875cc68f 100644
 --- a/src/MEDCoupling_Swig/CMakeLists.txt
 +++ b/src/MEDCoupling_Swig/CMakeLists.txt
+@@ -102,7 +102,7 @@ IF(MEDCOUPLING_BUILD_DOC)
+         swig_ready)
+ ENDIF()
+
+-IF(WIN32)
++IF(WIN32 OR APPLE)
+   # Under Windows MEDCoupling conflicts wiht medcoupling from PyWrapping
+   SET(MEDCouling_target_name MEDCouplingCompat)
+   SET_PROPERTY(SOURCE MEDCoupling.i PROPERTY SWIG_MODULE_NAME MEDCouplingCompat)
 @@ -121,13 +121,14 @@ ELSE()
    SWIG_ADD_LIBRARY(${MEDCouling_target_name} LANGUAGE python SOURCES MEDCoupling.i)
  ENDIF()
@@ -43,7 +52,7 @@ index f73ce98a..c810a0d9 100644
  IF(WIN32)
    SET_TARGET_PROPERTIES(_MEDCouplingRemapper PROPERTIES DEBUG_OUTPUT_NAME _MEDCouplingRemapper_d)
 diff --git a/src/MEDLoader/Swig/CMakeLists.txt b/src/MEDLoader/Swig/CMakeLists.txt
-index d718bafb..02e74334 100644
+index d718bafb..87a6f018 100644
 --- a/src/MEDLoader/Swig/CMakeLists.txt
 +++ b/src/MEDLoader/Swig/CMakeLists.txt
 @@ -83,7 +83,14 @@ ELSE()
@@ -63,7 +72,7 @@ index d718bafb..02e74334 100644
  IF(WIN32)
    SET_TARGET_PROPERTIES(_MEDLoader PROPERTIES DEBUG_OUTPUT_NAME _MEDLoader_d)
 diff --git a/src/MEDPartitioner_Swig/CMakeLists.txt b/src/MEDPartitioner_Swig/CMakeLists.txt
-index a61d64ad..f48352b8 100644
+index a61d64ad..9b3f3f6a 100644
 --- a/src/MEDPartitioner_Swig/CMakeLists.txt
 +++ b/src/MEDPartitioner_Swig/CMakeLists.txt
 @@ -62,7 +62,14 @@ ELSE()
@@ -83,7 +92,7 @@ index a61d64ad..f48352b8 100644
 
  IF(WIN32)
 diff --git a/src/ParaMEDMEM_Swig/CMakeLists.txt b/src/ParaMEDMEM_Swig/CMakeLists.txt
-index c191cc18..30172015 100644
+index c191cc18..779aa4f3 100644
 --- a/src/ParaMEDMEM_Swig/CMakeLists.txt
 +++ b/src/ParaMEDMEM_Swig/CMakeLists.txt
 @@ -64,7 +64,14 @@ ELSE()
@@ -103,7 +112,7 @@ index c191cc18..30172015 100644
 
  #
 diff --git a/src/PyWrapping/CMakeLists.txt b/src/PyWrapping/CMakeLists.txt
-index a897bb63..9792bef6 100644
+index a897bb63..66fec6f5 100644
 --- a/src/PyWrapping/CMakeLists.txt
 +++ b/src/PyWrapping/CMakeLists.txt
 @@ -66,13 +66,8 @@ INCLUDE_DIRECTORIES(
@@ -137,7 +146,7 @@ index a897bb63..9792bef6 100644
  IF(WIN32)
    SET_TARGET_PROPERTIES(_medcoupling PROPERTIES DEBUG_OUTPUT_NAME _medcoupling_d)
 diff --git a/src/RENUMBER_Swig/CMakeLists.txt b/src/RENUMBER_Swig/CMakeLists.txt
-index 5c9cfd36..e4af1936 100644
+index 5c9cfd36..4910ef47 100644
 --- a/src/RENUMBER_Swig/CMakeLists.txt
 +++ b/src/RENUMBER_Swig/CMakeLists.txt
 @@ -65,7 +65,14 @@ ELSE()

diff --git a/recipes/salome-medcoupling/meta.yaml b/recipes/salome-medcoupling/meta.yaml
@@ -42,11 +42,12 @@ requirements:
 test:
   imports:
     - MEDRenumber
-    - medcoupling
-    - MEDCoupling
     - MEDCouplingRemapper
     - MEDLoader
     - MEDPartitioner
+    - MEDCoupling  # [linux]
+    - MEDCouplingCompat # [win or osx]
+    - medcoupling
 
 about:
   home: https://www.salome-platform.org/downloads