cmake bits

diff --git a/cmd/dot/CMakeLists.txt b/cmd/dot/CMakeLists.txt
index 60d7ed2f95e8c51d49105e560520a42bc21a56b5..2ea855d91bf1e5119ddc7801a34a9d568a0a4fdb 100644 (file)
--- a/cmd/dot/CMakeLists.txt
+++ b/cmd/dot/CMakeLists.txt
@@ -17,15 +17,15 @@ INCLUDE_DIRECTORIES(
 )
 
 LINK_DIRECTORIES(
-       ${CMAKE_BINARY_DIR}/lib/commmon
+       ${CMAKE_BINARY_DIR}/lib/common
        ${CMAKE_BINARY_DIR}/lib/gvc
        ${CMAKE_BINARY_DIR}/lib/pathplan
        ${CMAKE_BINARY_DIR}/lib/graph
        ${CMAKE_BINARY_DIR}/lib/cdt
+       ${CMAKE_BINARY_DIR}/lib/gd
        $(PANGOCAIRO_LIB_DIR)
 )
 
-
 ########### next target ###############
 
 SET(dot_SRCS
@@ -37,7 +37,6 @@ ADD_EXECUTABLE(dot ${dot_SRCS})
 TARGET_LINK_LIBRARIES(dot
        common
        gvc
-       codegen
        pathplan
        graph
        cdt
@@ -68,15 +67,14 @@ ADD_EXECUTABLE(dot_static ${dot_static_SRCS})
 TARGET_LINK_LIBRARIES(dot_static
        common
        gvc_builtins
-       codegen
-       pathplan
-       graph
-       cdt
        gvplugin_dot_layout_static
        gvplugin_neato_layout_static
        gvplugin_pango_static
        gvplugin_gd_static
        gvplugin_core_static
+       pathplan
+       graph
+       cdt
        gvgd
        pango
        cairo

diff --git a/lib/common/CMakeLists.txt b/lib/common/CMakeLists.txt
index 251ae371dd9fc6d338e7c4c27909d650c400a086..5d3cb32d391a651140669bec0c23382f028782bb 100644 (file)
--- a/lib/common/CMakeLists.txt
+++ b/lib/common/CMakeLists.txt
@@ -16,39 +16,7 @@ INCLUDE_DIRECTORIES(
 
 ########### next target ###############
 
-ADD_CUSTOM_COMMAND(
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-       OUTPUT htmlparse.c
-       OUTPUT htmlparse.h
-       DEPENDS htmlparse.y
-       COMMAND yacc -dv htmlparse.y
-       COMMAND sed "s/yy/html/g" < y.tab.c > htmlparse.c
-       COMMAND sed "s/yy/html/g" < y.tab.h > htmlparse.h
-       COMMAND rm y.tab.c y.tab.h y.output
-)
-
-ADD_CUSTOM_COMMAND(
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-       OUTPUT ps.h
-       DEPENDS ps.txt
-       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/stringize.awk ps.txt > ps.h
-)
-
-ADD_CUSTOM_COMMAND(
-       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-       OUTPUT colortbl.h
-       DEPENDS color_names
-       DEPENDS brewer_colors
-       COMMAND LC_COLLATE=C sort color_names > color_lib
-       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/brewer.awk brewer_colors >> color_lib
-       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/colortbl.awk color_lib > colortbl.h
-       COMMAND rm color_lib
-)
-
 SET(common_SRCS
-       ps.h
-       colortbl.h
-       htmltable.h
        arrows.c
        colxlate.c
        fontmetrics.c
@@ -56,7 +24,6 @@ SET(common_SRCS
        memory.c
        globals.c
        htmllex.c
-       htmlparse.c
        htmltable.c
        input.c
        pointset.c
@@ -74,10 +41,6 @@ SET(common_SRCS
        emit.c
 )
 
-ADD_LIBRARY(common STATIC ${common_SRCS})
-
-########### next target ###############
-
 SET(codegen_SRCS
        diagen.c
        figgen.c
@@ -94,7 +57,43 @@ SET(codegen_SRCS
        xdgen.c
 )
 
-ADD_LIBRARY(codegen STATIC ${codegen_SRCS} )
+set(generated_SRCS
+       colortbl.h
+       htmlparse.h
+       htmlparse.c
+       ps.h
+)
+
+ADD_LIBRARY(common STATIC ${generated_SRCS} ${common_SRCS} ${codegen_SRCS} )
+
+ADD_CUSTOM_COMMAND(
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+       OUTPUT htmlparse.c
+       OUTPUT htmlparse.h
+       DEPENDS htmlparse.y
+       COMMAND yacc -dv htmlparse.y
+       COMMAND sed "s/yy/html/g" < y.tab.c > htmlparse.c
+       COMMAND sed "s/yy/html/g" < y.tab.h > htmlparse.h
+       COMMAND rm y.tab.c y.tab.h y.output
+)
+
+ADD_CUSTOM_COMMAND(
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+       OUTPUT ps.h
+       DEPENDS ps.txt
+       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/stringize.awk ps.txt > ps.h
+)
+
+ADD_CUSTOM_COMMAND(
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+       OUTPUT colortbl.h
+       DEPENDS color_names
+       DEPENDS brewer_colors
+       COMMAND LC_COLLATE=C sort color_names > color_lib
+       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/brewer.awk brewer_colors >> color_lib
+       COMMAND awk -f ${CMAKE_SOURCE_DIR}/awk/colortbl.awk color_lib > colortbl.h
+       COMMAND rm color_lib
+)
 
 ########### install files ###############
 

diff --git a/lib/neatogen/CMakeLists.txt b/lib/neatogen/CMakeLists.txt
index 15ea7d474beabbbaef64d6015b8857167aa8a818..1ac861de253749989e46772fa3f04fbefed86d7c 100644 (file)
--- a/lib/neatogen/CMakeLists.txt
+++ b/lib/neatogen/CMakeLists.txt
@@ -10,12 +10,13 @@ INCLUDE_DIRECTORIES(
        ${CMAKE_SOURCE_DIR}/lib/pathplan
        ${CMAKE_SOURCE_DIR}/lib/graph
        ${CMAKE_SOURCE_DIR}/lib/cdt
+       ${CMAKE_SOURCE_DIR}/lib/vpsc
 )
 
 
 ########### next target ###############
 
-SET(IPSEPCOLA_SRCS
+SET(ipsepcola_SRCS
        constrained_majorization_ipsep.c
        mosek_quad_solve.c
        quad_prog_vpsc.c 
@@ -58,10 +59,9 @@ SET(neatogen_SRCS
        constrained_majorization.c
        opt_arrangement.c
        compute_hierarchy.c
-       ${IPSEPCOLA_SRCS}
 )
 
-ADD_LIBRARY(neatogen STATIC ${neatogen_SRCS})
+ADD_LIBRARY(neatogen STATIC ${neatogen_SRCS} ${ipsepcola_SRCS})
 
 
 ########### install files ###############

diff --git a/tclpkg/gv/CMakeLists.txt b/tclpkg/gv/CMakeLists.txt
index 028bbb7ba2d4069b235df43a1c0ee113796a977d..25420029cf9240f26cfdd907f7f45500b7ffcfed 100644 (file)
--- a/tclpkg/gv/CMakeLists.txt
+++ b/tclpkg/gv/CMakeLists.txt
@@ -19,7 +19,7 @@ INCLUDE( FindSWIG )
 IF(${SWIG_FOUND})
 ########### next target #################
 
-INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/FindRuby.cmake )
+INCLUDE( FindRuby )
 IF(${RUBY_FOUND})
 INCLUDE_DIRECTORIES(
        ${BASE_INCLUDES}
@@ -40,7 +40,7 @@ ENDIF(${RUBY_FOUND})
 
 ########### next target #################
 
-INCLUDE( ${CMAKE_SOURCE_DIR}/cmake/FindTCL.cmake )
+INCLUDE( FindTCL )
 IF(${TCL_FOUND})
 INCLUDE_DIRECTORIES(
        ${BASE_INCLUDES}