diff --git a/DESCRIPTION b/DESCRIPTION index 883f6f205b2dd10b795cb619f6ec9216756960dd..e5606f20366caf02a36c6e4750a27fc76cbfb799 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -2,7 +2,7 @@ Package: cplexAPI Type: Package Title: R Interface to C API of IBM ILOG CPLEX Version: 1.4.1 -Date: 2020-09-21 +Date: 2020-09-22 Authors@R: c(person("Mayo", "Roettger", role = "cre", email = "mayo.roettger@hhu.de"), person("Gabriel", "Gelius-Dietrich", role = "aut", email = "geliudie@uni-duesseldorf.de"), person(c("C.", "Jonathan"), "Fritzemeier", role = c("ctb"), email = "clausjonathan.fritzemeier@uni-duesseldorf.de")) @@ -14,7 +14,7 @@ License: GPL-3 | file LICENSE LazyLoad: yes Collate: generics.R cplexConst.R cplexErrorClass.R cplexPtrClass.R cplex.R cplexAPI.R cplex_checkAPI.R cplex_longparamAPI.R zzz.R -Packaged: 2020-09-21 11:49:00 UTC; mayo +Packaged: 2020-09-22 08:36:00 UTC; mayo NeedsCompilation: yes Repository: CRAN -Date/Publication: 2020-09-21 13:49:00 +Date/Publication: 2020-09-22 10:36:00 diff --git a/configure b/configure index 96c99423ec899c3d5f2a456a4c675d47a3c13636..0d9e94818c648c198af2a876ebf5883a3594b2f6 100755 --- a/configure +++ b/configure @@ -3198,7 +3198,7 @@ fi test -n "$AWK" && break done - CPLEX_DIR=`ls -ld /Applications/CPLEX_Studio* |${AWK} '($1 ~ /^d/) { print $NF }' | head -n 1` + CPLEX_DIR=`ls -ldt /Applications/CPLEX_Studio* |${AWK} '($1 ~ /^d/) { print $NF }' | head -n 1` if test -z "$CPLEX_DIR" -o ! -d "$CPLEX_DIR" ; then as_fn_error $? "CPLEX interactive optimizer not found" "$LINENO" 5 fi diff --git a/configure.ac b/configure.ac index 5082b92e85bcfe83afab1ad42d9eb08a4548b8fe..a5b3d9c3dc63900688e203658053aa09487090d8 100644 --- a/configure.ac +++ b/configure.ac @@ -156,7 +156,8 @@ if test [ "$ARGS_OK" = "FALSE" -a -z "$CPLEX_DIR" ] ; then if test [ "$CPLEX_BIN" = "NONE" ] ; then dnl # Try Mac OS default folder guess AC_PROG_AWK - CPLEX_DIR=`ls -ld /Applications/CPLEX_Studio* |${AWK} '($1 ~ /^d/) { print $NF }' | head -n 1` + dnl # Take last modified CPLEX_Studio* directory + CPLEX_DIR=`ls -ldt /Applications/CPLEX_Studio* |${AWK} '($1 ~ /^d/) { print $NF }' | head -n 1` if test [ -z "$CPLEX_DIR" -o ! -d "$CPLEX_DIR" ] ; then AC_MSG_ERROR([CPLEX interactive optimizer not found]) fi diff --git a/inst/NEWS.Rd b/inst/NEWS.Rd index 3d7a3d32d8d5eee0e200d6fbec98469b9ad837a9..cc03cc47ce223cc1324b78d6d77eded66cc6b16c 100644 --- a/inst/NEWS.Rd +++ b/inst/NEWS.Rd @@ -4,7 +4,7 @@ \title{cplexAPI News} \encoding{UTF-8} % ---------------------------------------------------------------------------- % -\section{Changes in version 1.4.1 2020-09-21}{ +\section{Changes in version 1.4.1 2020-09-22}{ \itemize{ \item Adaptation of configure script to guess CPLEX installation directory on Mac OS, if neither environment variables PKG_CPPFLAGS and PKG_LIBS, nor configure arguments --with-cplex-include and --with-cplex-lib are given, and option