cmake development

diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt
index 1ac861de253749989e46772fa3f04fbefed86d7c..7c79a004884926ae60a92fca392ead377a9ff59b 100644 (file)
--- a/lib/neatogen/CMakeLists.txt
+++ b/lib/neatogen/CMakeLists.txt
@@ -1,109 +1,6 @@
 # $Id$ $Revision$
-## Process this file with cmake to produce Makefile
 
-INCLUDE_DIRECTORIES(
-       ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CMAKE_SOURCE_DIR}
-       ${CMAKE_SOURCE_DIR}/lib/common
-       ${CMAKE_SOURCE_DIR}/lib/gvc
-       ${CMAKE_SOURCE_DIR}/lib/pack
-       ${CMAKE_SOURCE_DIR}/lib/pathplan
-       ${CMAKE_SOURCE_DIR}/lib/graph
-       ${CMAKE_SOURCE_DIR}/lib/cdt
-       ${CMAKE_SOURCE_DIR}/lib/vpsc
-)
+INCLUDE(${CMAKE_SOURCE_DIR}/cmake/directories.cmake)
+INCLUDE(${neatogen_SRCDIR}/sources.cmake)
 
-
-########### next target ###############
-
-SET(ipsepcola_SRCS
-       constrained_majorization_ipsep.c
-       mosek_quad_solve.c
-       quad_prog_vpsc.c 
-)
-
-SET(neatogen_SRCS
-       adjust.c
-       circuit.c
-       edges.c
-       find_ints.c
-       geometry.c
-       heap.c
-       hedges.c
-       info.c
-       neatoinit.c
-       intersect.c
-       legal.c
-       lu.c
-       matinv.c
-       memory.c
-       poly.c
-       printvis.c
-       site.c
-       solve.c
-       neatosplines.c
-       stuff.c
-       voronoi.c
-       stress.c
-       kkutils.c
-       matrix_ops.c
-       embed_graph.c
-       dijkstra.c
-       conjgrad.c
-       pca.c
-       closest.c
-       bfs.c
-       constraint.c
-       quad_prog_solve.c
-       smart_ini_x.c
-       constrained_majorization.c
-       opt_arrangement.c
-       compute_hierarchy.c
-)
-
-ADD_LIBRARY(neatogen STATIC ${neatogen_SRCS} ${ipsepcola_SRCS})
-
-
-########### install files ###############
-
-
-
-
-#original Makefile.am contents follow:
-
-## $Id$ $Revision$
-### Process this file with automake to produce Makefile.in
-#
-#AM_CPPFLAGS = \
-#        -I$(top_srcdir) \
-#        -I$(top_srcdir)/lib/common \
-#        -I$(top_srcdir)/lib/gvc \
-#        -I$(top_srcdir)/lib/pack \
-#        -I$(top_srcdir)/lib/pathplan \
-#        -I$(top_srcdir)/lib/graph \
-#        -I$(top_srcdir)/lib/cdt @IPSEPCOLA_INCLUDES@
-#
-#noinst_LTLIBRARIES = libneatogen_C.la
-#
-#noinst_HEADERS = adjust.h edges.h geometry.h heap.h hedges.h info.h mem.h \
-#      neato.h poly.h neatoprocs.h simple.h site.h voronoi.h \
-#      bfs.h closest.h conjgrad.h defs.h dijkstra.h embed_graph.h kkutils.h \
-#      matrix_ops.h pca.h stress.h quad_prog_solver.h digcola.h \
-#      quad_prog_vpsc.h
-#
-#IPSEPCOLA_SOURCES = constrained_majorization_ipsep.c \
-#      mosek_quad_solve.c mosek_quad_solve.h quad_prog_vpsc.c 
-#
-#if WITH_IPSEPCOLA
-#WITH_IPSEPCOLA_SOURCES = $(IPSEPCOLA_SOURCES)
-#endif
-#
-#libneatogen_C_la_SOURCES = adjust.c circuit.c edges.c find_ints.c geometry.c \
-#      heap.c hedges.c info.c neatoinit.c intersect.c legal.c lu.c matinv.c \
-#      memory.c poly.c printvis.c site.c solve.c neatosplines.c stuff.c \
-#      voronoi.c stress.c kkutils.c matrix_ops.c embed_graph.c dijkstra.c \
-#      conjgrad.c pca.c closest.c bfs.c constraint.c quad_prog_solve.c \
-#      smart_ini_x.c constrained_majorization.c opt_arrangement.c \
-#      compute_hierarchy.c $(WITH_IPSEPCOLA_SOURCES)
-#
-#EXTRA_DIST = Makefile.old $(IPSEPCOLA_SOURCES)
+ADD_LIBRARY(neatogen STATIC ${neatogen_SRCS})