Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2024-03-25 Tomas Kalibera <tomas.kalibera@gmail.com>

* src/Makevars.win: Preferentially use QuantLib from the system if
found via pkg-config (prepare for upcoming Rtools)

2025-03-24 Dirk Eddelbuettel <edd@debian.org>

* DESCRIPTION (Version, Date): New release 0.4.25
Expand Down
18 changes: 14 additions & 4 deletions src/Makevars.win
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,25 @@
# Copyright 2011 Uwe Ligges, Brian Ripley, and Josh Ulrich
# Copyright 2018 - 2024 Jeroen Ooms

RWINLIB=../windows/quantlib
PKG_CPPFLAGS=-I$(RWINLIB)/include -I../inst/include
PKG_CXXFLAGS=-DBOOST_NO_AUTO_PTR
PKG_LIBS = -L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib -lQuantLib
PKG_CPPFLAGS = $(shell pkg-config --cflags quantlib 2>/dev/null)
PKG_LIBS = $(shell pkg-config --libs quantlib 2>/dev/null)

ifeq ($(PKG_LIBS),)
RWINLIB = ../windows/quantlib
PKG_CPPFLAGS = -I$(RWINLIB)/include
PKG_LIBS = -L$(RWINLIB)/lib$(R_ARCH) -L$(RWINLIB)/lib -lQuantLib
endif

PKG_CPPFLAGS += -I../inst/include
PKG_CXXFLAGS = -DBOOST_NO_AUTO_PTR

all: clean winlibs

clean:
rm -f $(SHLIB) $(OBJECTS)

winlibs:
ifneq ($(RWINLIB),)
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
endif

Loading