diff --git a/.gitignore b/.gitignore index c834d2a3..fde87dbc 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ models/MetaRegression/fit_wPSMA_reg10/*.RDS models/MetaRegression/fit_PSMA_reg10/*.RDS models/MetaRegression/fit_3PP_reg10/*.RDS models/MetaRegression/* +config.log +config.status +src/Makevars diff --git a/DESCRIPTION b/DESCRIPTION index 9476ec67..d1ae84e9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: RoBMA Title: Robust Bayesian Meta-Analyses -Version: 3.0.0 +Version: 3.0.1 Maintainer: František Bartoš Authors@R: c( person("František", "Bartoš", role = c("aut", "cre"), diff --git a/NEWS.md b/NEWS.md index 14260114..004c31c9 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +## version 3.0.1 +### Fixes (thanks to Don & Rens) +- compilation issues with Clang (https://github.com/FBartos/RoBMA/issues/28) +- lapack path specifications (https://github.com/FBartos/RoBMA/issues/24) + ## version 3.0 ### Features - meta-regression with `RoBMA.reg()` function diff --git a/R/utilities.R b/R/utilities.R index 10d69535..0002cc34 100644 --- a/R/utilities.R +++ b/R/utilities.R @@ -90,6 +90,7 @@ assign("check_scaling", TRUE, envir = Ro "2.3.1" = c("0.2.3", "999.999.999"), "2.3.2" = c("0.2.3", "999.999.999"), "3.0.0" = c("0.2.14", "999.999.999"), + "3.0.1" = c("0.2.14", "999.999.999"), stop("New RoBMA version needs to be defined in '.check_BayesTools' function!") ) diff --git a/configure.ac b/configure.ac index 703c0e24..85ad3d25 100755 --- a/configure.ac +++ b/configure.ac @@ -19,6 +19,9 @@ CXX=`"${R_HOME}/bin/R" CMD config CXX` CFLAGS=`"${R_HOME}/bin/R" CMD config CFLAGS` CXXFLAGS=`"${R_HOME}/bin/R" CMD config CXXFLAGS` CPPFLAGS=`"${R_HOME}/bin/R" CMD config CPPFLAGS` +LAPACK_LIBS=`"${R_HOME}/bin/R" CMD config LAPACK_LIBS` +BLAS_LIBS=`"${R_HOME}/bin/R" CMD config BLAS_LIBS` +FLIBS=`"${R_HOME}/bin/R" CMD config FLIBS` # Try using pkg-config to set compiler flags diff --git a/src/Makevars.in b/src/Makevars.in index aba3e872..11236b0a 100644 --- a/src/Makevars.in +++ b/src/Makevars.in @@ -17,9 +17,12 @@ ### Prepending 0 to JAGS_MAJOR_VERSION prevents it being set as blank (the C++ code requires a number) ### JAGS_MAJOR_ASSUMED is not needed (always 0) on unix ############### +LAPACK_LIBS=`"${R_HOME}/bin/R" CMD config LAPACK_LIBS` +BLAS_LIBS=`"${R_HOME}/bin/R" CMD config BLAS_LIBS` +FLIBS=`"${R_HOME}/bin/R" CMD config FLIBS` PKG_CPPFLAGS=@JAGS_CFLAGS@ -D JAGS_MAJOR_FORCED=0$(JAGS_MAJOR_VERSION) -D JAGS_MAJOR_ASSUMED=0 -PKG_LIBS=@JAGS_LIBS@ @JAGS_RPATH@ -ljrmath -llapack +PKG_LIBS=@JAGS_LIBS@ @JAGS_RPATH@ -ljrmath $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) ############### diff --git a/src/source/mnorm.cc b/src/source/mnorm.cc index bc00ecfe..3744a0df 100644 --- a/src/source/mnorm.cc +++ b/src/source/mnorm.cc @@ -8,7 +8,6 @@ #include #include #include -#include #include "../matrix/matrix.h" using namespace std;