[certi-cvs] certi/test Billard/CMakeLists.txt libgraphc/CMa...

[CERTI CVS commits]

CVSROOT:        /sources/certi
Module name:    certi
Changes by:     Eric NOULARD <erk>      14/05/15 10:53:52

Modified files:
        test/Billard   : CMakeLists.txt 
        test/libgraphc : CMakeLists.txt 

Log message:
        Fix compile error on MacOS with both mac port X11 and Quartz/native X11 
installed 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/certi/test/Billard/CMakeLists.txt?cvsroot=certi&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/certi/test/libgraphc/CMakeLists.txt?cvsroot=certi&r1=1.10&r2=1.11

Patches:
Index: Billard/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/Billard/CMakeLists.txt,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Billard/CMakeLists.txt      9 Dec 2013 13:56:19 -0000       1.14
+++ Billard/CMakeLists.txt      15 May 2014 10:53:51 -0000      1.15
@@ -55,7 +55,7 @@
 ELSE(X_DISPLAY_MISSING)
   ADD_EXECUTABLE(billard ${billard_SRCS})
   TARGET_LINK_LIBRARIES(billard graph RTI FedTime)  
-  TARGET_LINK_LIBRARIES(billard ${X11_LIBRARIES})
+  
   INSTALL(TARGETS billard
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib

Index: libgraphc/CMakeLists.txt
===================================================================
RCS file: /sources/certi/certi/test/libgraphc/CMakeLists.txt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- libgraphc/CMakeLists.txt    11 Apr 2013 20:16:19 -0000      1.10
+++ libgraphc/CMakeLists.txt    15 May 2014 10:53:52 -0000      1.11
@@ -14,7 +14,9 @@
     ARCHIVE DESTINATION lib)
 
 if (NOT X_DISPLAY_MISSING)
+   include_directories(${X11_INCLUDE_DIR})
    add_library(graph ${BESTATIC} graph_c.cc)
+   target_link_libraries(graph ${X11_LIBRARIES})
    install(TARGETS graph
     RUNTIME DESTINATION bin
     LIBRARY DESTINATION lib