[certi-cvs] certi config.h.cmake CMakeLists.txt test/libgra...

[certi-cvs]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      11/01/09 18:01:45

Modified files:
        .              : config.h.cmake CMakeLists.txt 
        test/libgraphc : CMakeLists.txt 
        test/Billard   : CMakeLists.txt 

Log message:
        Compile Billard twice.
        billard --> with GUI (when X11 found)
        billard-nogui --> always compiled

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/config.h.cmake?cvsroot=certi&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/certi/CMakeLists.txt?cvsroot=certi&r1=1.95&r2=1.96
http://cvs.savannah.gnu.org/viewcvs/certi/test/libgraphc/CMakeLists.txt?cvsroot=certi&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/CMakeLists.txt?cvsroot=certi&r1=1.9&r2=1.10

Patches:
Index: config.h.cmake
===================================================================
RCS file: /sources/certi/certi/config.h.cmake,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- config.h.cmake      16 Oct 2009 21:34:24 -0000      1.5
+++ config.h.cmake      9 Jan 2011 18:01:44 -0000       1.6
@@ -96,9 +96,6 @@
 /* Version number of package */
 #cmakedefine VERSION "@PACKAGE_VERSION@"
 
-/* Define to 1 if the X Window System is missing or not being used. */
-#cmakedefine X_DISPLAY_MISSING 1
-
 /* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a
    `char[]'. */
 #cmakedefine YYTEXT_POINTER 1

Index: CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/CMakeLists.txt,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -b -r1.95 -r1.96
--- CMakeLists.txt      21 Nov 2010 15:32:51 -0000      1.95
+++ CMakeLists.txt      9 Jan 2011 18:01:45 -0000       1.96
@@ -283,7 +283,7 @@
 IF (NOT FORCE_NO_X11)
     FIND_PACKAGE(X11)
 ELSE(NOT FORCE_NO_X11)
-    MESSAGE(STATUS "FORCE_NO_X11 OPTION has been  set: Billard Test 
Application will not have GUI.")
+    MESSAGE(STATUS "FORCE_NO_X11 OPTION has been set: only Billard Test 
Application with no GUI will be built.")
     SET(X11_FOUND 0)
 ENDIF(NOT FORCE_NO_X11)
 
@@ -352,10 +352,6 @@
   SET(X_DISPLAY_MISSING 1)
 ENDIF (X11_FOUND)
 
-IF(X_DISPLAY_MISSING)
-  MESSAGE(STATUS "Some X11 header were not found: Billard Test Application 
will not have GUI.")
-ENDIF(X_DISPLAY_MISSING)
-
 ################ LEX YACC Check ####################
 FIND_PACKAGE(LexYacc)
 

Index: test/libgraphc/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/libgraphc/CMakeLists.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- test/libgraphc/CMakeLists.txt       19 Nov 2007 14:07:04 -0000      1.6
+++ test/libgraphc/CMakeLists.txt       9 Jan 2011 18:01:45 -0000       1.7
@@ -1,13 +1,22 @@
-
 # FIXME I do not remember why this should be static?
 # on non WINDOWS platform
-IF (WIN32 AND MINGW)
-    ADD_LIBRARY(graph graph_c.cc)
-ELSE(WIN32 AND MINGW)
-    ADD_LIBRARY(graph STATIC graph_c.cc)
-ENDIF(WIN32 AND MINGW)
+set(BESTATIC "")
+if (WIN32 AND MINGW)
+    set(BESTATIC "STATIC")
+endif(WIN32 AND MINGW)
+
+add_library(graph-nogui ${BESTATIC} graph_c.cc)
+set_target_properties(graph-nogui PROPERTIES COMPILE_FLAGS 
"-DX_DISPLAY_MISSING=1")
+
+install(TARGETS graph-nogui
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)
 
-INSTALL(TARGETS graph
+if (NOT X11_DISPLAY_MISSING)
+   add_library(graph ${BESTATIC} graph_c.cc)
+   install(TARGETS graph
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)
+endif(NOT X11_DISPLAY_MISSING)

Index: test/Billard/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/Billard/CMakeLists.txt,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- test/Billard/CMakeLists.txt 28 Mar 2010 16:08:34 -0000      1.9
+++ test/Billard/CMakeLists.txt 9 Jan 2011 18:01:45 -0000       1.10
@@ -5,7 +5,7 @@
 include_directories(${CERTI_SOURCE_DIR}/libHLA)
 
 IF (WIN32)
-ADD_DEFINITIONS(-DHAVE_STRING_H)
+   ADD_DEFINITIONS(-DHAVE_STRING_H)
 ENDIF (WIN32)
 
 ########### next target ###############
@@ -22,14 +22,22 @@
   getopt1.c
   )
 
-ADD_EXECUTABLE(billard ${billard_SRCS})
-TARGET_LINK_LIBRARIES(billard graph RTI FedTime)
-
-IF (X11_FOUND)
+IF(X_DISPLAY_MISSING)
+  MESSAGE(STATUS "Some X11 header were not found: only Billard Test 
Application with no GUI will be built.")
+ELSE(X_DISPLAY_MISSING)
+  ADD_EXECUTABLE(billard ${billard_SRCS})
+  TARGET_LINK_LIBRARIES(billard graph RTI FedTime)  
   TARGET_LINK_LIBRARIES(billard ${X11_LIBRARIES})
-ENDIF (X11_FOUND)
+  INSTALL(TARGETS billard
+    RUNTIME DESTINATION bin
+    LIBRARY DESTINATION lib
+    ARCHIVE DESTINATION lib)  
+ENDIF(X_DISPLAY_MISSING)
 
-INSTALL(TARGETS billard
+ADD_EXECUTABLE(billard-nogui ${billard_SRCS})
+set_target_properties(billard-nogui PROPERTIES COMPILE_FLAGS 
"-DX_DISPLAY_MISSING=1")
+TARGET_LINK_LIBRARIES(billard-nogui graph-nogui RTI FedTime)
+INSTALL(TARGETS billard-nogui
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib
     ARCHIVE DESTINATION lib)