Merge pull request #23 from williamfgc/conda

Updated conda scripts
ornladios · Jan 29, 2020 · 692043a · 692043a
2 parents 126b790 + 4cda644
commit 692043a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/scripts/conda/meta.yaml b/scripts/conda/meta.yaml
@@ -1,14 +1,15 @@
 package:
-  name: adios2-examples-openmpi
-  version: 2.5.0
+  name: adios2-examples
+  version: 2.5.0-rc2
 
 build:
   number: 0
-  string: full
+  string: openmpi
 
 source:
   git_url: https://github.com/ornladios/adios2-examples.git
-  git_rev: master
+  git_rev: v2.5.0-rc2
+  git_depth: 1
 
 requirements:
   build:
@@ -17,13 +18,13 @@ requirements:
     - mpi4py
     - numpy=1.15
     - cmake
-    - adios2-openmpi
+    - adios2-openmpi=2.5.0=full
   run:
     - python
     - openmpi
     - mpi4py
     - numpy=1.15
-    - adios2-openmpi
+    - adios2-openmpi=2.5.0=full
     - matplotlib
 
 about:

diff --git a/source/cpp/gray-scott/CMakeLists.txt b/source/cpp/gray-scott/CMakeLists.txt
@@ -23,7 +23,10 @@ install(FILES "adios2.xml" "visit-bp4.session" "visit-bp4.session.gui"
                            "simulation/settings-files.json"
                            "simulation/settings-staging.json"
                            "plot/decomp.py" "plot/gsplot.py" "plot/pdfplot.py"
-                           "cleanup.sh" "README.md"
-        DESTINATION 
-        ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott)
-
+                           "README.md"
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott) 
+
+
+install(PROGRAMS "cleanup.sh" 
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/adios2-examples/gray-scott) 
+