[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[certi-cvs] certi/test/Billard CMakeLists.txt
From: |
certi-cvs |
Subject: |
[certi-cvs] certi/test/Billard CMakeLists.txt |
Date: |
Wed, 23 Apr 2008 21:39:44 +0000 |
CVSROOT: /sources/certi
Module name: certi
Changes by: Eric NOULARD <erk> 08/04/23 21:39:44
Modified files:
test/Billard : CMakeLists.txt
Log message:
Add missing target dependency
which should make CMake to always link
to the appropriate inside-project lib.
See:
bug #22890 : cmake does not correctly set X_DISPLAY_MISSING
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/CMakeLists.txt?cvsroot=certi&r1=1.4&r2=1.5
Patches:
Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/Billard/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CMakeLists.txt 25 Jun 2007 13:09:59 -0000 1.4
+++ CMakeLists.txt 23 Apr 2008 21:39:44 -0000 1.5
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(
+INCLUDE_DIRECTORIES(BEFORE
${CMAKE_SOURCE_DIR}/libCERTI
${CMAKE_SOURCE_DIR}/test/libgraphc
)
@@ -22,6 +22,7 @@
)
ADD_EXECUTABLE(billard ${billard_SRCS})
+ADD_DEPENDENCIES(billard graph CERTI RTI)
TARGET_LINK_LIBRARIES(billard ${SOCKET_LIBRARY} ${LIBXML2_LIBRARIES} graph
CERTI RTI)
@@ -34,40 +35,8 @@
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
-
########### install files ###############
-
-
INSTALL(FILES
Test.fed Test.xml
DESTINATION share/federations)
-#original Makefile.am contents follow:
-
-### $Id: CMakeLists.txt,v 1.4 2007/06/25 13:09:59 erk Exp $
-###
-### Process this file with automake to produce Makefile.in
-#
-#feddir = $(prefix)/share/federations
-#
-#MAINTAINERCLEANFILES = Makefile.in
-#
-#INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libCERTI \
-#-I$(top_srcdir)/test/libgraphc @XML_CFLAGS@ @HAVE_XML@ @XCFLAGS@ \
address@hidden@ @WITH_CYGWIN@
-#
-#bin_PROGRAMS = billard
-#
-#fed_DATA = Test.fed Test.xml
-#
-#noinst_HEADERS = Billard.hh BillardDDM.hh Ball.hh ColoredBall.hh \
-#Display.hh cmdline.h getopt.h
-#
-#billard_SOURCES = Billard.cc BillardDDM.cc Ball.cc ColoredBall.cc \
-#Display.cc main.cc cmdline.c getopt.c getopt1.c
-#
-#LDADD = -L$(top_builddir)/libRTI -L$(top_builddir)/test/libgraphc \
-#-L$(top_builddir)/libCERTI -lRTI -lgraph -lCERTI @XLIBS@ \
address@hidden@ @XML_LIBS@ @LEXLIB@
-#
-#EXTRA_DIST = Test.fed Test.xml
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [certi-cvs] certi/test/Billard CMakeLists.txt,
certi-cvs <=