link to cytolib RGLab/cytolib#37

RGLab · Apr 10, 2020 · a4c711c · a4c711c
1 parent 1010dc6
commit a4c711c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: CytoML
 Type: Package
 Title: A GatingML Interface for Cross Platform Cytometry Data Sharing
-Version: 1.99.12
+Version: 1.99.13
 Date: 2016-04-15
 Author: Mike Jiang, J. Spidlen., N. Gopalakrishnan, F. Hahne, B. Ellis, R. Gentleman, M. Dalphin, N. Le Meur, B. Purcell
 Maintainer: Mike Jiang <[email protected]>
@@ -11,7 +11,7 @@ License: file LICENSE
 License_restricts_use: yes
 LazyData: TRUE
 Imports:
-    cytolib(>= 1.99.26),
+    cytolib(>= 1.99.28),
     flowCore (>= 1.99.10),
     flowWorkspace (>= 3.99.15),
     openCyto (>= 1.99.2),

diff --git a/src/Makevars.in b/src/Makevars.in
@@ -9,5 +9,9 @@ endif
 CXX_STD = CXX14
 PKG_CPPFLAGS =-DROUT -I../inst/include/ @PKG_CPPFLAGS@ -DBOOST_NO_AUTO_PTR -Wno-unknown-pragmas -Wno-comment 
 
+RHDF5_LIBS= $(shell echo 'Rhdf5lib::pkgconfig("PKG_CXX_LIBS")'|\
+    "${R_HOME}/bin/R" --vanilla --slave)
 
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) @PKG_LIBS@  
+PKG_LIBS = `${R_HOME}/bin/Rscript -e "cytolib:::cytolib_LdFlags()"` $(RHDF5_LIBS) $(LAPACK_LIBS) $(BLAS_LIBS) @PKG_LIBS@   
+
+