Fixed install problems with wrap so headers now go in include/wrap

release/4.3a0
Alex Cunningham 2012-01-18 15:12:58 +00:00
parent fb3a959193
commit 269ac46bd9
1 changed files with 5 additions and 6 deletions

View File

@ -12,7 +12,7 @@ sources =
check_PROGRAMS = check_PROGRAMS =
noinst_PROGRAMS = noinst_PROGRAMS =
wrap_PROGRAMS = wrap_PROGRAMS =
wrapdir = $(pkgincludedir)/wrap wrapdir = $(includedir)/wrap
# disable all of matlab toolbox build by default # disable all of matlab toolbox build by default
if ENABLE_BUILD_TOOLBOX if ENABLE_BUILD_TOOLBOX
@ -21,15 +21,14 @@ if ENABLE_BUILD_TOOLBOX
sources += utilities.cpp Argument.cpp ReturnValue.cpp Constructor.cpp sources += utilities.cpp Argument.cpp ReturnValue.cpp Constructor.cpp
sources += Method.cpp StaticMethod.cpp Class.cpp Module.cpp FileWriter.cpp sources += Method.cpp StaticMethod.cpp Class.cpp Module.cpp FileWriter.cpp
check_PROGRAMS += tests/testSpirit tests/testWrap check_PROGRAMS += tests/testSpirit tests/testWrap
if ENABLE_INSTALL_WRAP
wrap_PROGRAMS += wrap # Manually install wrap later
else
noinst_PROGRAMS += wrap noinst_PROGRAMS += wrap
endif
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# Create a libtool library that is not installed # Create a libtool library that is not installed
# The headers are installed in $(includedir)/gtsam: # The headers are installed in $(includedir)/wrap:
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# Only install the header necessary for wrap interfaces to build with mex # Only install the header necessary for wrap interfaces to build with mex
headers += matlab.h headers += matlab.h