more cmake stuff

diff --git a/cmd/gvpr/CMakeLists.txt b/cmd/gvpr/CMakeLists.txt
index f9cab3e8f82822a7965933dff1863044d7a04f9c..5a9504f68e492fc65e9dfc5b9e606c6d7f461eec 100644 (file)
--- a/cmd/gvpr/CMakeLists.txt
+++ b/cmd/gvpr/CMakeLists.txt
@@ -3,6 +3,14 @@
 
 INCLUDE_DIRECTORIES(
        ${CMAKE_CURRENT_SOURCE_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_SOURCE_DIR}lib/expr
+       ${CMAKE_SOURCE_DIR}lib/vmalloc
+       ${CMAKE_SOURCE_DIR}lib/sfio
+       ${CMAKE_SOURCE_DIR}lib/ast
+       ${CMAKE_SOURCE_DIR}lib/ingraphs
+       ${CMAKE_SOURCE_DIR}lib/agraph
+       ${CMAKE_SOURCE_DIR}lib/cdt
 )
 
 

diff --git a/cmd/lefty/CMakeLists.txt b/cmd/lefty/CMakeLists.txt
index 8abe5c624e9c1d4a953d03a318cc6ee7282573cd..9c136e11e7cb1bbfd928d2f12a5c0e310729799f 100644 (file)
--- a/cmd/lefty/CMakeLists.txt
+++ b/cmd/lefty/CMakeLists.txt
@@ -1,6 +1,8 @@
 # $Id$ $Revision$
 ## Process this file with cmake to produce Makefile
 
+INCLUDE( FindX11 )
+
 SUBDIRS(
        ws
        os
@@ -10,10 +12,13 @@ SUBDIRS(
 
 INCLUDE_DIRECTORIES(
        ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}/ws/x11
+       ${CMAKE_CURRENT_SOURCE_DIR}/os/unix
+       ${CMAKE_CURRENT_SOURCE_DIR}/dot2l
+       ${X11_INCLUDE_DIR}
 )
 
-
 ########### next target ###############
 
 SET(lefty_SRCS
@@ -35,7 +40,19 @@ SET(lefty_SRCS
 
 ADD_EXECUTABLE(lefty ${lefty_SRCS})
 
-#TARGET_LINK_LIBRARIES(lefty  ${QT_AND_KDECORE_LIBS} )
+TARGET_LINK_LIBRARIES(lefty
+       ws
+       filereq
+       os
+       dot2l
+       Xaw
+       Xt
+       Xmu
+       Xext
+       X11
+#      socket
+       m
+)
 
 INSTALL_TARGETS(/bin lefty )
 

diff --git a/cmd/lefty/dot2l/CMakeLists.txt b/cmd/lefty/dot2l/CMakeLists.txt
index 95db9f9de1d5676a187de0d78ed509760904caeb..56fbed3b78873f096d92382efde3ea3eaaff17d1 100644 (file)
--- a/cmd/lefty/dot2l/CMakeLists.txt
+++ b/cmd/lefty/dot2l/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 INCLUDE_DIRECTORIES(
        ${CMAKE_CURRENT_SOURCE_DIR}
-       ${CMAKE_BINARY_DIR}
+       ${CMAKE_SOURCE_DIR}
        ${CMAKE_SOURCE_DIR}/cmd/lefty
 )
 
@@ -11,15 +11,17 @@ INCLUDE_DIRECTORIES(
 ########### next target ###############
 
 ADD_CUSTOM_COMMAND(
-       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dotparse.c
-       OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/dotparse.h
-       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/dotparse.y
-       COMMAND bison -dv ${CMAKE_CURRENT_SOURCE_DIR} dotparse.y
-       COMMAND cat < ${CMAKE_CURRENT_BINARY_DIR}/y.tab.c > ${CMAKE_CURRENT_BINARY_DIR}/dotparse.c
-       COMMAND cat < ${CMAKE_CURRENT_BINARY_DIR}/y.tab.h > ${CMAKE_CURRENT_BINARY_DIR}/dotparse.h
+       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+       OUTPUT dotparse.c
+       OUTPUT dotparse.h
+       DEPENDS dotparse.y
+       COMMAND yacc -dv dotparse.y
+       COMMAND cat < y.tab.c > dotparse.c
+       COMMAND cat < y.tab.h > dotparse.h
 )
 
 SET(dot2l_SRCS
+       dotparse.h
        dot2l.c
        dotlex.c
        dotparse.c