Skip to content

Commit dc9ee46

Browse files
authored
Merge pull request #1 from jcarpent/devel
Fix cmake packaging
2 parents 5488b19 + 8f38284 commit dc9ee46

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
3333
PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
3434
CHECK_MINIMAL_CXX_STANDARD(11 ENFORCE)
3535

36-
3736
FINDPYTHON()
38-
FIND_NUMPY()
3937

40-
FIND_PACKAGE(Boost REQUIRED)
41-
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
4238
SET_BOOST_DEFAULT_OPTIONS()
39+
ADD_PROJECT_DEPENDENCY(Boost REQUIRED)
40+
SEARCH_FOR_BOOST_PYTHON(REQUIRED)
4341
EXPORT_BOOST_DEFAULT_OPTIONS()
4442

4543
ADD_PROJECT_DEPENDENCY(cppad 20180000.0 REQUIRED PKG_CONFIG_REQUIRES "cppad >= 20180000.0")
@@ -87,7 +85,6 @@ TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME}
8785
${Boost_INCLUDE_DIRS}
8886
${EIGEN3_INCLUDE_DIR}
8987
${PYTHON_INCLUDE_DIRS}
90-
${NUMPY_INCLUDE_DIRS}
9188
$<INSTALL_INTERFACE:include>)
9289
TARGET_INCLUDE_DIRECTORIES(${PROJECT_NAME} PUBLIC $<INSTALL_INTERFACE:include>)
9390

@@ -106,5 +103,4 @@ ADD_SUBDIRECTORY(python)
106103

107104
PKG_CONFIG_APPEND_LIBS(${PROJECT_NAME})
108105
PKG_CONFIG_APPEND_CFLAGS("-I${PYTHON_INCLUDE_DIRS}")
109-
PKG_CONFIG_APPEND_CFLAGS("-I${NUMPY_INCLUDE_DIRS}")
110106
PKG_CONFIG_APPEND_BOOST_LIBS(${BOOST_COMPONENTS})

package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<name>pycppad</name>
44
<version>1.0.0</version>
55
<description>Python bindings for CppAD and CppADCodeGen using Boost.Python</description>
6-
<maintainer email="rohan.budhiraja@inria.fr">Justin Carpentier</maintainer>
6+
<maintainer email="rohan.budhiraja@inria.fr">Rohan Budhiraja</maintainer>
77
<author>Rohan Budhiraja</author>
88
<author>Justin Carpentier</author>
99
<license>BSD</license>

0 commit comments

Comments
 (0)