Skip to content

Commit a39b620

Browse files
Ivann SchlosserIvann Schlosser
authored andcommitted
commit of version 1 including protozero and libosmium
1 parent 469012a commit a39b620

File tree

240 files changed

+51917
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

240 files changed

+51917
-3
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: cppRnet
22
Title: Fast en Efficient OSM Data in R
3-
Version: 0.0.9000
3+
Version: 1.0.0
44
Authors@R:
55
person("Ivann", "Schlosser", , "schlosserivann@gmail.com", role = c("aut", "cre"),
66
comment = c(ORCID = "https://orcid.org/0009-0004-4099-3198"))

NEWS.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# cppRnet 1.0.0
2+
3+
* Big update since the package no longer depends on a local installation of *protozero* and *libosmium*, they are imported and built with the package, making it mostly self sufficient.
4+
15
# cppRnet 0.0.9000
26

37
* Added a `NEWS.md` file to track changes to the package.

src/Makevars

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,29 @@
1-
PKG_CPPFLAGS = -I/opt/homebrew/Cellar/libosmium/2.20.0/libexec/include -I/opt/homebrew/Cellar/libosmium/2.20.0/include
2-
PKG_LIBS = -L/opt/homebrew/Cellar/libosmium/2.20.0 -lexpat -pthread -lz
1+
# PKG_CPPFLAGS = -I/opt/homebrew/Cellar/libosmium/2.20.0/libexec/include -I/opt/homebrew/Cellar/libosmium/2.20.0/include
2+
# PKG_LIBS = -L/opt/homebrew/Cellar/libosmium/2.20.0 -lexpat -pthread -lz
3+
4+
PKG_CPPFLAGS = -Ilibosmium/include -Iprotozero/include
5+
# PKG_LIBS = protozero/libprotozero.a libsomium/libosmium.a
6+
7+
$(SHLIB): libosmium protozero
8+
9+
protozero:
10+
(cd protozero; \
11+
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
12+
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
13+
cmake . \
14+
-DCMAKE_BUILD_TYPE=Release \
15+
-DBUILD_SHARED_LIBS:bool=OFF \
16+
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
17+
$(MAKE))
18+
19+
20+
21+
libosmium:
22+
(cd libosmium; \
23+
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
24+
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
25+
cmake . \
26+
-DCMAKE_BUILD_TYPE=Release \
27+
-DBUILD_SHARED_LIBS:bool=OFF \
28+
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
29+
$(MAKE))

src/Makevars.win

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
# PKG_CPPFLAGS = -I/opt/homebrew/Cellar/libosmium/2.20.0/libexec/include -I/opt/homebrew/Cellar/libosmium/2.20.0/include
2+
# PKG_LIBS = -L/opt/homebrew/Cellar/libosmium/2.20.0 -lexpat -pthread -lz
3+
4+
PKG_CPPFLAGS = -Ilibosmium/include -Iprotozero/include
5+
# PKG_LIBS = protozero/libprotozero.a libsomium/libosmium.a
6+
7+
$(SHLIB): libosmium protozero
8+
9+
protozero:
10+
(cd protozero; \
11+
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
12+
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
13+
cmake . \
14+
-DCMAKE_BUILD_TYPE=Release \
15+
-DBUILD_SHARED_LIBS:bool=OFF \
16+
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
17+
$(MAKE))
18+
19+
20+
21+
libosmium:
22+
(cd libosmium; \
23+
CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" \
24+
CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" \
25+
cmake . \
26+
-DCMAKE_BUILD_TYPE=Release \
27+
-DBUILD_SHARED_LIBS:bool=OFF \
28+
-DCMAKE_POSITION_INDEPENDENT_CODE:bool=ON; \
29+
$(MAKE))

0 commit comments

Comments
 (0)