Skip to content

Commit

Permalink
removed some spacing, changed the date, fixes ANTsX#133
Browse files Browse the repository at this point in the history
  • Loading branch information
muschellij2 committed Jul 23, 2021
1 parent 980f4b7 commit 876861a
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 18 deletions.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: ANTsRCore
Type: Package
Title: Core Software Infrastructure for 'ANTsR'
Version: 0.7.4.9
Date: 2020-05-20
Version: 0.7.5
Date: 2021-07-23
Authors@R: c(
person(given = "Brian B.", family = "Avants", role = "cre",
email = "[email protected]"),
Expand Down
1 change: 0 additions & 1 deletion R/antsImageMutualInformation.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#' @param nBins number of bins to use in joint histogram estimate, often set between 8 and 32
#' @return mutual information value
#' @author Brian B. Avants
#' @keywords image information mutual similarity,
#' @examples
#'
#' fi<-antsImageRead( getANTsRData("r16") ,2)
Expand Down
20 changes: 9 additions & 11 deletions configure
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
#!/usr/bin/env bash

CXX_STD=CXX11

ITKRCMAKE=`${R_HOME}/bin/Rscript -e 'a<-ITKR:::itkIncludes(); cat(a)'`
Expand All @@ -11,16 +9,16 @@ ITKTAG=`${R_HOME}/bin/Rscript -e 'env = asNamespace("ITKR"); if ("itkTag" %in% n
# get a version of cmake
cmaker=`${R_HOME}/bin/Rscript -e "x=Sys.which('cmake'); cat(x)"`
if [[ -z "${cmaker}" ]]; then
res=`${R_HOME}/bin/Rscript -e "cat(('cmaker' %in% installed.packages())*1)"`
if [[ $res -eq 0 ]];
then
git clone https://github.com/stnava/cmaker ;
R CMD INSTALL cmaker ;
rm -rf cmaker ;
fi
res=`${R_HOME}/bin/Rscript -e "cat(('cmaker' %in% installed.packages())*1)"`
if [[ $res -eq 0 ]];
then
git clone https://github.com/stnava/cmaker ;
R CMD INSTALL cmaker ;
rm -rf cmaker ;
fi
cmaker=`${R_HOME}/bin/Rscript -e "x=cmaker::cmake()"`
else
cmaker="cmake"
cmaker="cmake"
fi

# if [[ ! -x $cmaker ]] ; then # try r version
Expand Down Expand Up @@ -66,7 +64,7 @@ echo "PKG_CPPFLAGS= ${PKG_CPPFLAGS} -I\${ITK} -I\${PWD} -I\${myantssource}/Examp
-I\${myantssource}/Utilities -I\${myantssource}/Examples/ -I../inst/include/ \
-I\${myantssource}/Tensor/ " >> Makevars

echo "CXX_STD = CXX11" >> Makevars
echo "CXX_STD=CXX11" >> Makevars

# echo "myantslib=\${R_LIBS_USER}/libs/lib" >> Makevars
echo "myantslib=\${PWD}/antb/ANTS-build/Examples/" >> Makevars
Expand Down
4 changes: 0 additions & 4 deletions man/antsImageMutualInformation.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 876861a

Please sign in to comment.