12345qiupeng
/
gtsam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed DLONG flag from compilation of ccolamd to fix linking error

release/4.3a0
Alex Cunningham 2011-06-02 15:40:47 +00:00
parent 9dcdf7f2c1
commit 0b639e9287
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gtsam/3rdparty/ccolamd/ChangeLog vendored
View File

@ -6,6 +6,7 @@ June 2, 2011:
* Added UFconfig.[c|h] from the UFconfig suitesparse package * Added UFconfig.[c|h] from the UFconfig suitesparse package
* Renamed licence file to LGPL.txt - contents remain the same * Renamed licence file to LGPL.txt - contents remain the same
* All code is unchanged from original * All code is unchanged from original
* Note: DLONG define removed from build script for compatibility - only necessary to build for long version
Original ChangeLog by authors Original ChangeLog by authors

9
gtsam/3rdparty/ccolamd/Makefile.am vendored
View File

@ -7,12 +7,9 @@
# header files are qualified so they can be included in external projects. # header files are qualified so they can be included in external projects.
AUTOMAKE_OPTIONS = nostdinc AUTOMAKE_OPTIONS = nostdinc
headers =
sources =
# CCOLAMD (with UFconfig files included) # CCOLAMD (with UFconfig files included)
headers += ccolamd.h UFconfig.h headers = ccolamd.h UFconfig.h
sources += ccolamd.c ccolamd_global.c UFconfig.c sources = ccolamd.c ccolamd_global.c UFconfig.c
#---------------------------------------------------------------------------------------------------- #----------------------------------------------------------------------------------------------------
# Create a libtool library that is not installed # Create a libtool library that is not installed
@ -26,5 +23,5 @@ libccolamd_la_SOURCES = $(sources)
AM_CPPFLAGS = AM_CPPFLAGS =
AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(top_srcdir) -DDLONG AM_CPPFLAGS += $(BOOST_CPPFLAGS) -I$(top_srcdir)
AM_LDFLAGS = $(BOOST_LDFLAGS) AM_LDFLAGS = $(BOOST_LDFLAGS)