mail[Wesnoth-commits] r43261 - in /trunk/src/ana: ./ api/ apps/chat/


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by billybiset on June 10, 2010 - 22:00:
Author: billynux
Date: Thu Jun 10 22:00:19 2010
New Revision: 43261

URL: http://svn.gna.org/viewcvs/wesnoth?rev=43261&view=rev
Log:
Fixed cmake files to support the apps option in ana.

Modified:
    trunk/src/ana/CMakeLists.txt
    trunk/src/ana/api/binary_streams.hpp   (props changed)
    trunk/src/ana/apps/chat/CMakeLists.txt
    trunk/src/ana/apps/chat/client.cpp
    trunk/src/ana/apps/chat/server.cpp

Modified: trunk/src/ana/CMakeLists.txt
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/CMakeLists.txt?rev=43261&r1=43260&r2=43261&view=diff
==============================================================================
--- trunk/src/ana/CMakeLists.txt (original)
+++ trunk/src/ana/CMakeLists.txt Thu Jun 10 22:00:19 2010
@@ -3,8 +3,6 @@
 project( ana )
 
 add_subdirectory( src )
-
-add_subdirectory( apps )
 
 option( apps "Compile sample applications as well" OFF )
 
@@ -12,5 +10,3 @@
     message ( STATUS "Compiling sample applications as well." )
     add_subdirectory( apps )
 endif ( apps )
-
-

Propchange: trunk/src/ana/api/binary_streams.hpp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/src/ana/api/binary_streams.hpp
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Modified: trunk/src/ana/apps/chat/CMakeLists.txt
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/apps/chat/CMakeLists.txt?rev=43261&r1=43260&r2=43261&view=diff
==============================================================================
--- trunk/src/ana/apps/chat/CMakeLists.txt (original)
+++ trunk/src/ana/apps/chat/CMakeLists.txt Thu Jun 10 22:00:19 2010
@@ -1,20 +1,17 @@
-find_library( ANA ana REQUIRED )
 
 find_library( GETOPT getopt_pp REQUIRED )
 
-if ( ANA )
-    if ( GETOPT )
-        add_executable( server server.cpp )
+include_directories( ../../api )
 
-        target_link_libraries( server ${ANA} ${GETOPT} )
+if ( GETOPT )
+    add_executable( server server.cpp )
 
-        add_executable( client client.cpp )
+    target_link_libraries( server ana ${GETOPT} )
 
-        target_link_libraries( client ${ANA} ${GETOPT} )
+    add_executable( client client.cpp )
 
-    else ( GETOPT )
-        message ( FATAL_ERROR "Install GetOpt_pp: getoptpp.googlecode.com" )
-    endif (GETOPT )
-else ( ANA )
-    message ( FATAL_ERROR "Install the ana library." )
-endif ( ANA )
+    target_link_libraries( client ana ${GETOPT} )
+
+else ( GETOPT )
+    message ( FATAL_ERROR "Install GetOpt_pp: getoptpp.googlecode.com" )
+endif (GETOPT )

Modified: trunk/src/ana/apps/chat/client.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/apps/chat/client.cpp?rev=43261&r1=43260&r2=43261&view=diff
==============================================================================
--- trunk/src/ana/apps/chat/client.cpp (original)
+++ trunk/src/ana/apps/chat/client.cpp Thu Jun 10 22:00:19 2010
@@ -34,7 +34,7 @@
 
 #include "getopt_pp.h"
 
-#include "ana/ana.hpp"
+#include "ana.hpp"
 
 using namespace GetOpt;
 using namespace ana;

Modified: trunk/src/ana/apps/chat/server.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/ana/apps/chat/server.cpp?rev=43261&r1=43260&r2=43261&view=diff
==============================================================================
--- trunk/src/ana/apps/chat/server.cpp (original)
+++ trunk/src/ana/apps/chat/server.cpp Thu Jun 10 22:00:19 2010
@@ -34,7 +34,7 @@
 
 #include <boost/bind.hpp>
 
-#include "ana/ana.hpp"
+#include "ana.hpp"
 #include "getopt_pp.h"
 
 using namespace GetOpt;




Related Messages


Powered by MHonArc, Updated Thu Jun 10 23:40:14 2010