From 5823a66b77fadb235cda93bd0bc57e0bcb6d1735 Mon Sep 17 00:00:00 2001 From: Xun Li Date: Mon, 21 Oct 2024 16:05:39 -0700 Subject: [PATCH] apply fix --- .gitmodules | 3 +++ src/Makevars | 9 ++------- src/Makevars.win | 2 +- src/libgeoda | 1 + 4 files changed, 7 insertions(+), 8 deletions(-) create mode 160000 src/libgeoda diff --git a/.gitmodules b/.gitmodules index e69de29b..b2f2c995 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "src/libgeoda"] + path = src/libgeoda + url = https://github.com/geodacenter/libgeoda.git diff --git a/src/Makevars b/src/Makevars index 882c02a4..304e3b19 100644 --- a/src/Makevars +++ b/src/Makevars @@ -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) \ @@ -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 = \ @@ -149,7 +144,7 @@ OBJECTS = \ rcpp_clustering.o \ RcppExports.o -.PHONY: download-submodules all +.PHONY: all all: $(SHLIB) diff --git a/src/Makevars.win b/src/Makevars.win index ef2b8e0a..b0c7563a 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -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) \ diff --git a/src/libgeoda b/src/libgeoda new file mode 160000 index 00000000..a2a40be4 --- /dev/null +++ b/src/libgeoda @@ -0,0 +1 @@ +Subproject commit a2a40be473dd27f7ed60b5c0e9f69e0302ab8d4e