From eb61d44d3dfc7f4ef0e6643b940f8a3e5af47e1d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Wed, 8 Apr 2020 15:37:01 +0200 Subject: [PATCH] [wip/cppadcodegen] ensure that PREFIX.cppad is used --- cppadcodegen/Makefile | 2 ++ cppadcodegen/distinfo | 1 + cppadcodegen/patches/patch-ab | 16 ++++++++++++++++ 3 files changed, 19 insertions(+) create mode 100644 cppadcodegen/patches/patch-ab diff --git a/cppadcodegen/Makefile b/cppadcodegen/Makefile index 4f46b809..08dfe577 100644 --- a/cppadcodegen/Makefile +++ b/cppadcodegen/Makefile @@ -20,6 +20,8 @@ LICENSE= eclipse MAINTAINER= gsaurel@laas.fr CMAKE_ARGS+= -DCREATE_DOXYGEN_DOC=YES +CMAKE_ARGS+= -DCPPAD_HOME=${PREFIX.cppad} + DYNAMIC_PLIST_DIRS+= share/doc/cppadcg include ../../wip/cppad/depend.mk diff --git a/cppadcodegen/distinfo b/cppadcodegen/distinfo index 72477c11..fd3a3d0a 100644 --- a/cppadcodegen/distinfo +++ b/cppadcodegen/distinfo @@ -2,3 +2,4 @@ SHA1 (v2.4.3.tar.gz) = 34746ee7fb1cd2483e974c39e62557f1dcc26810 RMD160 (v2.4.3.tar.gz) = cd3f396234e77893e50ec9c5b25a2a0f8f4bf64f Size (v2.4.3.tar.gz) = 572645 bytes SHA1 (patch-aa) = 47d408925ca7fa808a4c4412cf2736c49bf2570e +SHA1 (patch-ab) = d9c5286ec1518c2133fcdc1b21f3cefe46d83571 diff --git a/cppadcodegen/patches/patch-ab b/cppadcodegen/patches/patch-ab new file mode 100644 index 00000000..680f86ad --- /dev/null +++ b/cppadcodegen/patches/patch-ab @@ -0,0 +1,16 @@ +--- cmake/FindCppAD.cmake.orig 2020-03-18 19:33:25.000000000 +0100 ++++ cmake/FindCppAD.cmake 2020-04-08 15:35:47.121123892 +0200 +@@ -27,7 +27,7 @@ + IF (DEFINED CPPAD_HOME) + + FIND_PATH(CPPAD_INCLUDE_DIR NAMES cppad/cppad.hpp +- PATHS "${CPPAD_HOME}" ++ PATHS "${CPPAD_HOME}/include" + NO_DEFAULT_PATH) + + FIND_LIBRARY(CPPAD_IPOPT_LIBRARY +@@ -107,4 +107,3 @@ + ENDIF () + + ENDIF () +- -- GitLab