Skip to content

Commit

Permalink
apply fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@lixun910
lixun910 committed Oct 21, 2024
1 parent ea07d98 commit 5823a66
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "src/libgeoda"]
path = src/libgeoda
url = https://github.com/geodacenter/libgeoda.git
9 changes: 2 additions & 7 deletions src/Makevars
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
RGEODALIB = ./libgeoda
BOOST_PATH = ./boost-develop/boost_1_86_0
BOOST_PATH = ../inst/boost-develop/boost_1_86_0

PKG_CPPFLAGS=\
-I$(RGEODALIB) \
Expand All @@ -11,11 +11,6 @@ PKG_CPPFLAGS=\
PKG_LIBS=\
-pthread

# clone boost-develop and libgeoda submodules
download-submodules:
git clone https://github.com/GeoDaCenter/boost-develop.git
git clone https://github.com/geodacenter/libgeoda.git

CXX_STD=CXX17

CPP_SRC_FILES = \
Expand Down Expand Up @@ -149,7 +144,7 @@ OBJECTS = \
rcpp_clustering.o \
RcppExports.o

.PHONY: download-submodules all
.PHONY: all

all: $(SHLIB)

Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.win
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TARGET = lib$(subst gcc,,$(COMPILED_BY))$(R_ARCH)

RGEODALIB = ./libgeoda
BOOST_PATH = ./boost-develop/boost_1_86_0
BOOST_PATH = ../inst/boost-develop/boost_1_86_0

PKG_CPPFLAGS=\
-I$(RGEODALIB) \
Expand Down
1 change: 1 addition & 0 deletions src/libgeoda
Submodule libgeoda added at a2a40b

0 comments on commit 5823a66

Please sign in to comment.