diff options
| author | Jeff Donahue <jeff.donahue@gmail.com> | 2014-03-31 14:16:11 -0700 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-04-02 10:58:49 -0700 |
| commit | abf44a6174df4cfd69849c91cc237bb33a4e6e3e (patch) | |
| tree | 46dcdddcf47fdc8378c315ca7dfe52ddd1069ca3 /Makefile | |
| parent | 48994cf0ddcaac0ca875c166dd3a1d0a3d1f4c8b (diff) | |
| download | caffe-abf44a6174df4cfd69849c91cc237bb33a4e6e3e.tar.gz caffe-abf44a6174df4cfd69849c91cc237bb33a4e6e3e.tar.bz2 caffe-abf44a6174df4cfd69849c91cc237bb33a4e6e3e.zip | |
matcaffe fixes
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -1,11 +1,8 @@ # The makefile for caffe. Pretty hacky. PROJECT := caffe -include Makefile.config - -############################################################################## -# After this line, things should happen automatically. -############################################################################## +CONFIG_FILE := Makefile.config +include $(CONFIG_FILE) # The target static library and shared library name LIB_BUILD_DIR := $(BUILD_DIR)/lib @@ -58,7 +55,10 @@ PY$(PROJECT)_SRC := python/$(PROJECT)/_$(PROJECT).cpp PY$(PROJECT)_SO := python/$(PROJECT)/_$(PROJECT).so # MAT$(PROJECT)_SRC is the matlab wrapper for $(PROJECT) MAT$(PROJECT)_SRC := matlab/$(PROJECT)/mat$(PROJECT).cpp -MAT$(PROJECT)_SO := matlab/$(PROJECT)/$(PROJECT) +ifneq ($(MATLAB_DIR),) + MAT_SO_EXT := $(shell $(MATLAB_DIR)/bin/mexext) +endif +MAT$(PROJECT)_SO := matlab/$(PROJECT)/$(PROJECT).$(MAT_SO_EXT) ############################## # Derive generated files @@ -220,6 +220,11 @@ mat$(PROJECT): mat mat: $(MAT$(PROJECT)_SO) $(MAT$(PROJECT)_SO): $(MAT$(PROJECT)_SRC) $(STATIC_NAME) + @ if [ -z "$(MATLAB_DIR)" ]; then \ + echo "MATLAB_DIR must be specified in $(CONFIG_FILE)" \ + "to build mat$(PROJECT)."; \ + exit 1; \ + fi $(MATLAB_DIR)/bin/mex $(MAT$(PROJECT)_SRC) $(STATIC_NAME) \ CXXFLAGS="\$$CXXFLAGS $(CXXFLAGS) $(WARNINGS)" \ CXXLIBS="\$$CXXLIBS $(LDFLAGS)" -o $@ |