Merge branch 'dev'

Author: evanbiederstedt

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.0.2] - 2022 March 3
+* Modified the Makevars file to correctly add an rpath (Runpath Search Path) for Mac OS users with `install_name_tool`. From the manual, the command used is `-change old new` whereby this "Changes  the dependent shared library install name old to new in the specified Mach-O binary.  More than one of these options can be specified.  If the Mach-O binary does not contain the old install name in a specified -change option the option is ignored."
+
 ## [1.0.1] - 2021 Dec 03
 * Modified the Makevars to use SHLIB_EXT to account for both shared library extensions on Mac OS (either *.so or *dylib)
 

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: leidenAlg
 Type: Package
 Title: Implements the Leiden Algorithm via an R Interface
-Version: 1.0.1
+Version: 1.0.2
 Authors@R: c(person("Peter", "Kharchenko", email = "Peter_Kharchenko@hms.harvard.edu", role = c("aut")), person("Viktor", "Petukhov", email = "viktor.s.petukhov@ya.ru", role = c("aut")), person("V.A.", "Traag", email = "v.a.traag@cwts.leidenuniv.nl", role = c("ctb")), person("Gábor", "Csárdi", email = "sardi.gabor@gmail.com", role = c("ctb")), person("Tamás", "Nepusz", email = "ntamas@gmail.com", role = c("ctb")), person("Minh Van", "Nguyen", email = "nguyenminh2@gmail.com", role = c("ctb")), person("Evan", "Biederstedt", email = "evan.biederstedt@gmail.com", role=c("cre", "aut")))
 Description: An R interface to the Leiden algorithm, an iterative community detection algorithm on networks. The algorithm is designed to converge to a partition in which all subsets of all communities are locally optimally assigned, yielding communities guaranteed to be connected. The implementation proves to be fast, scales well, and can be run on graphs of millions of nodes (as long as they can fit in memory). The original implementation was constructed as a python interface "leidenalg" found here: <https://github.com/vtraag/leidenalg>. The algorithm was originally described in Traag, V.A., Waltman, L. & van Eck, N.J. "From Louvain to Leiden: guaranteeing well-connected communities". Sci Rep 9, 5233 (2019) <doi:10.1038/s41598-019-41695-z>.
 License: GPL-3 

README.md

@@ -77,5 +77,5 @@ If you find `leidenAlg` useful for your publication, please cite:
 ```
 Peter Kharchenko, Viktor Petukhov and Evan Biederstedt (2021).
 leidenAlg: Implements the Leiden Algorithm via an R Interface. R
-package version 1.0.1. https://github.com/kharchenkolab/leidenAlg
+package version 1.0.2. https://github.com/kharchenkolab/leidenAlg
 ```

src/Makevars

@@ -19,8 +19,9 @@ SUBLIBS = leidenalg.a
 
 IGRAPH_LIB = $(PKGB_PATH)/igraph$(SHLIB_EXT)
 
-all: $(SHLIB) 
-	if [ "$(OS)" != "Windows_NT" ] && [ `uname -s` = 'Darwin' ]; then install_name_tool -id '@rpath/igraph$(SHLIB_EXT)' $(IGRAPH_LIB); fi 
+all: $(SHLIB)
+	if [ "$(OS)" != "Windows_NT" ] && [ `uname -s` = 'Darwin' ]; then install_name_tool -change 'igraph$(SHLIB_EXT)' $(PKGB_PATH)/igraph$(SHLIB_EXT) $(SHLIB); fi
+
 
 $(SHLIB): $(OBJECTS) sublibs
 sublibs: sublibraries