From 322b161e7ddbbf9b61514ac27d56ee775f7bcc58 Mon Sep 17 00:00:00 2001 From: ellson Date: Fri, 23 Jun 2006 15:40:41 +0000 Subject: [PATCH] more cmake stuff --- cmd/gvpr/CMakeLists.txt | 8 ++++++++ cmd/lefty/CMakeLists.txt | 23 ++++++++++++++++++++--- cmd/lefty/dot2l/CMakeLists.txt | 16 +++++++++------- 3 files changed, 37 insertions(+), 10 deletions(-) diff --git a/cmd/gvpr/CMakeLists.txt b/cmd/gvpr/CMakeLists.txt index f9cab3e8f..5a9504f68 100644 --- 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 8abe5c624..9c136e11e 100644 --- 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 95db9f9de..56fbed3b7 100644 --- 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 -- 2.40.0