colladadom: copy system specific build artifacts (don't just assume linux)
This commit is contained in:
parent
47c65893d6
commit
84a88a02ba
|
@ -11,6 +11,17 @@ include $(shell rospack find mk)/download_unpack_build.mk
|
||||||
|
|
||||||
ROOT = $(shell rospack find colladadom)
|
ROOT = $(shell rospack find colladadom)
|
||||||
|
|
||||||
|
# Copied from dom/Makefile:
|
||||||
|
# os: 'linux', 'mac', 'windows', or 'ps3'. Use the 'uname' command to decide the
|
||||||
|
# default value. To detect when we're on Windows we'll check to see if we're
|
||||||
|
# running on Cygwin or MinGW.
|
||||||
|
OS := linux
|
||||||
|
ifneq ($(shell uname | grep -i darwin),)
|
||||||
|
OS := mac
|
||||||
|
else ifneq ($(or $(shell uname | grep -i cygwin),$(shell uname | grep -i mingw)),)
|
||||||
|
OS := windows
|
||||||
|
endif
|
||||||
|
|
||||||
installed: wiped $(SOURCE_DIR)/unpacked
|
installed: wiped $(SOURCE_DIR)/unpacked
|
||||||
@echo "ROOT is: $(ROOT)"
|
@echo "ROOT is: $(ROOT)"
|
||||||
-mkdir -p $(ROOT)/include
|
-mkdir -p $(ROOT)/include
|
||||||
|
@ -20,7 +31,7 @@ installed: wiped $(SOURCE_DIR)/unpacked
|
||||||
cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
|
cd $(SOURCE_DIR)/dom && make $(ROS_PARALLEL_JOBS)
|
||||||
cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/
|
cp -rf $(SOURCE_DIR)/dom/include/* $(ROOT)/include/
|
||||||
mv $(ROOT)/include/1.5/dom $(ROOT)/include/dom
|
mv $(ROOT)/include/1.5/dom $(ROOT)/include/dom
|
||||||
cp -f $(SOURCE_DIR)/dom/build/linux-1.5/*.* $(ROOT)/lib/
|
cp -rf $(SOURCE_DIR)/dom/build/$(OS)-1.5/*.* $(ROOT)/lib/
|
||||||
touch installed
|
touch installed
|
||||||
|
|
||||||
wiped: Makefile
|
wiped: Makefile
|
||||||
|
|
Loading…
Reference in New Issue