aboutsummaryrefslogtreecommitdiff
path: root/math/ros-geometry/files/patch-kdl_Makefile
blob: f0a8b8e0812e70b7d1a380dc852a26ea8cdb36e2 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
--- kdl/Makefile.orig	2010-11-22 19:18:28.000000000 +0100
+++ kdl/Makefile	2010-11-22 22:36:47.000000000 +0100
@@ -14,7 +14,6 @@
 BOOST_INCLUDE =$(shell rosboost-cfg --include_dirs)
 EIGEN2_INCLUDE_DIR=`rospack cflags-only-I eigen| cut -d ' ' -f 1`
 EIGEN2_DEFINE=`rospack cflags-only-other eigen`
-TINYXML_INCLUDE_DIR=`rospack cflags-only-I tinyxml| cut -d ' ' -f 1`
 CMAKE_ARGS = -DCMAKE_INSTALL_PREFIX=$(INSTALL_DIR)/ \
 		-DPYTHON_BINDINGS=ON \
                 -DCMAKE_CXX_FLAGS=$(EIGEN2_DEFINE) \
@@ -22,7 +21,6 @@
 		-DBUILD_MODELS=OFF \
 		-DBOOST:STRING=$(BOOST_INCLUDE)\
 		-DEIGEN2_INCLUDE_DIR=$(EIGEN2_INCLUDE_DIR)\
-		-DTINYXML_INCLUDE_DIR=$(TINYXML_INCLUDE_DIR)\
 		-DCMAKE_BUILD_TYPE="Release"
 
 
@@ -30,7 +28,11 @@
 	cd $(SOURCE_DIR) && patch -p0 < ../../$(PATCH)
 	mkdir -p $(SOURCE_DIR)/build
 	cd $(SOURCE_DIR)/build && $(CMAKE) $(CMAKE_ARGS) ..
+ifneq ($(MAKE),)
+	cd $(SOURCE_DIR)/build && $(MAKE) $(ROS_PARALLEL_JOBS) && touch src/orocos-kdl.pc && make install
+else
 	cd $(SOURCE_DIR)/build && make $(ROS_PARALLEL_JOBS) && touch src/orocos-kdl.pc && make install
+endif
 	if [ `uname` = Darwin ]; then \
 		install_name_tool -id `rospack find kdl`/kdl/lib/liborocos-kdl.1.0.dylib kdl/lib/liborocos-kdl.1.0.dylib; \
 	fi
@@ -42,14 +44,17 @@
 	ln -s $(SOURCE_DIR)/build/doc doc
 
 wiped: Makefile $(PATCH) kdl-31715.tar.gz.md5sum
+ifneq ($(MAKE),)
+	$(MAKE) wipe
+else
 	make wipe
+endif
 	touch wiped
 
 clean:
 	rm -rf lib
 	rm -rf include
 	rm -rf share
-	rm -rf build
 	rm -rf installed
 
 wipe: 	clean